aurelia-cycle - npm Package Compare versions

Comparing version 0.0.6 to 0.1.0

dist/aurelia-cycle.d.ts

 declare module 'aurelia-cycle' {
 import { Observable } from 'rxjs/Rx';
-export function configure(frameworkConfig: any): void;
-export type PropertyViewSetterMap = Map<string, (value) => void>;
-export type ViewObservable = Observable<string | number>;
-export type FromViewActionObservable = Observable<Action> & {
-    _aureliaType: 'action' | 'property';
+import { FrameworkConfiguration } from 'aurelia-framework';
+export function configure(frameworkConfig: FrameworkConfiguration): void;
+export type Action = {
+    event: AnyEvent;
+    arguments: Array<any>;
 };
-export type FromViewValueObservable = ViewObservable & {
-    _aureliaType: 'action' | 'property';
+export type Value = string | number;
+export type ViewValue = Action | Value;
+export type ObservableTypeExtension = {
+    _cycleType: 'action' | 'value';
 };
-export type FromViewObservable = FromViewActionObservable | FromViewValueObservable;
-export type FromViewObservableMap = Map<string, FromViewObservable>;
+export type ActionObservable = Observable<Action> & ObservableTypeExtension;
+export type ValueObservable = Observable<Value> & ObservableTypeExtension;
+export type ViewObservable = (Observable<Action> | Observable<Value>) & ObservableTypeExtension;
 export type ViewObservableMap = Map<string, ViewObservable>;
-export type ViewValues = Map<string, string | number>;
 export type AnyEvent = Event | FocusEvent | GamepadEvent | HashChangeEvent | KeyboardEvent | MessageEvent | MouseEvent | MouseWheelEvent | MSGestureEvent | MSManipulationEvent | MSMediaKeyMessageEvent | MSMediaKeyNeededEvent | MSSiteModeEvent | MutationEvent | NavigationCompletedEvent | NavigationEvent | NavigationEventWithReferrer | OfflineAudioCompletionEvent | PageTransitionEvent | PermissionRequestedEvent | PointerEvent | PopStateEvent | ProgressEvent | ScriptNotifyEvent | StorageEvent | SVGZoomEvent | TextEvent | TouchEvent | TrackEvent | TransitionEvent | UIEvent | UnviewableContentIdentifiedEvent | WebGLContextEvent | WheelEvent;
-export type Action = {
-    event: AnyEvent;
-    arguments: Array<any>;
-};
 export type ViewSource = {
-    values: (bindingName: string) => FromViewValueObservable;
-    actions: (bindingName: string) => FromViewActionObservable;
+    values: (bindingName: string) => ValueObservable;
+    actions: (bindingName: string) => ActionObservable;
 };
 export function makeAureliaDriver(context: any): any;
-export class CycleBindingBehavior {
-    bind(binding: any, scope: any, name: any): void;
-    unbind(binding: any, scope: any): void;
 }
-export function cycle(potentialTarget?: any): any;
-}

dist/index.d.ts

 import { Observable } from 'rxjs/Rx';
-export declare function configure(frameworkConfig: any): void;
-export declare type PropertyViewSetterMap = Map<string, (value) => void>;
-export declare type ViewObservable = Observable<string | number>;
-export declare type FromViewActionObservable = Observable<Action> & {
-    _aureliaType: 'action' | 'property';
+import { FrameworkConfiguration } from 'aurelia-framework';
+export declare function configure(frameworkConfig: FrameworkConfiguration): void;
+export declare type Action = {
+    event: AnyEvent;
+    arguments: Array<any>;
 };
-export declare type FromViewValueObservable = ViewObservable & {
-    _aureliaType: 'action' | 'property';
+export declare type Value = string | number;
+export declare type ViewValue = Action | Value;
+export declare type ObservableTypeExtension = {
+    _cycleType: 'action' | 'value';
 };
-export declare type FromViewObservable = FromViewActionObservable | FromViewValueObservable;
-export declare type FromViewObservableMap = Map<string, FromViewObservable>;
+export declare type ActionObservable = Observable<Action> & ObservableTypeExtension;
+export declare type ValueObservable = Observable<Value> & ObservableTypeExtension;
+export declare type ViewObservable = (Observable<Action> | Observable<Value>) & ObservableTypeExtension;
 export declare type ViewObservableMap = Map<string, ViewObservable>;
-export declare type ViewValues = Map<string, string | number>;
 export declare type AnyEvent = Event | FocusEvent | GamepadEvent | HashChangeEvent | KeyboardEvent | MessageEvent | MouseEvent | MouseWheelEvent | MSGestureEvent | MSManipulationEvent | MSMediaKeyMessageEvent | MSMediaKeyNeededEvent | MSSiteModeEvent | MutationEvent | NavigationCompletedEvent | NavigationEvent | NavigationEventWithReferrer | OfflineAudioCompletionEvent | PageTransitionEvent | PermissionRequestedEvent | PointerEvent | PopStateEvent | ProgressEvent | ScriptNotifyEvent | StorageEvent | SVGZoomEvent | TextEvent | TouchEvent | TrackEvent | TransitionEvent | UIEvent | UnviewableContentIdentifiedEvent | WebGLContextEvent | WheelEvent;
-export declare type Action = {
-    event: AnyEvent;
-    arguments: Array<any>;
-};
 export declare type ViewSource = {
-    values: (bindingName: string) => FromViewValueObservable;
-    actions: (bindingName: string) => FromViewActionObservable;
+    values: (bindingName: string) => ValueObservable;
+    actions: (bindingName: string) => ActionObservable;
 };
 export declare function makeAureliaDriver(context: any): any;
-export declare class CycleBindingBehavior {
-    bind(binding: any, scope: any, name: any): void;
-    unbind(binding: any, scope: any): void;
-}
-export declare function cycle(potentialTarget?: any): any;

dist/index.js

@@ -1,7 +0,5 @@
-define(["require", "exports", 'aurelia-templating', 'rxjs/Rx', '@cycle/core/lib/index', '@cycle/rxjs-adapter/lib/index', 'aurelia-logging'], function (require, exports, aurelia_templating_1, Rx_1, index_1, index_2, TheLogManager) {
+define(["require", "exports", 'aurelia-binding', 'aurelia-templating', 'rxjs/Rx', '@cycle/core/lib/index', '@cycle/rxjs-adapter/lib/index', 'aurelia-framework'], function (require, exports, aurelia_binding_1, aurelia_templating_1, Rx_1, index_1, index_2, aurelia_framework_1) {
     "use strict";
-    var logger = TheLogManager.getLogger('aurelia-cycle');
+    var logger = aurelia_framework_1.LogManager.getLogger('aurelia-cycle-new');
     function configure(frameworkConfig) {
-        var bindingBehaviorInstance = frameworkConfig.container.get(CycleBindingBehavior);
-        frameworkConfig.aurelia.resources.registerBindingBehavior('cycle', bindingBehaviorInstance);
         var originalBind = aurelia_templating_1.View.prototype.bind;
@@ -30,23 +28,106 @@ aurelia_templating_1.View.prototype.bind = function bind(context, overrideContext, _systemUpdate) {
         };
+        var callScopeConnect = aurelia_binding_1.CallScope.prototype.connect;
+        aurelia_binding_1.CallScope.prototype.connect = function connect(binding, scope) {
+            callScopeConnect.apply(this, arguments);
+            console.log('connected', binding, scope, this);
+            if (this.name == 'cycleValue') {
+                console.log('we have a cycleValue connect!');
+                var context = scope.bindingContext;
+                var name_1 = this.args[0].evaluate(scope, binding.lookupFunctions, true);
+                var observable = getOrCreateObservable(name_1, context);
+                observable.subscribe(function (value) {
+                    var bindingValue = binding.sourceExpression.evaluate(binding.source, binding.lookupFunctions);
+                    binding.updateTarget(bindingValue);
+                }, function (error) { return logger.error("binding error for " + name_1, error); }, function () { return logger.debug("observable for " + name_1 + " complete"); });
+            }
+        };
+        var callScopeConstructor = aurelia_binding_1.CallScope.prototype.constructor;
+        aurelia_binding_1.CallScope.prototype.constructor = function () {
+            callScopeConstructor.apply(this, arguments);
+            this.isAssignable = true;
+        };
+        function triggerObservers(name, value, context) {
+            var observers = context.observers.get(name);
+            if (observers)
+                observers.forEach(function (observer) { return observer.next(value); });
+            else
+                logger.error("no observer set exists for " + name + " cycle binding");
+        }
+        aurelia_binding_1.CallScope.prototype.assign = function assign(scope, value, lookupFunctions) {
+            var context = aurelia_binding_1.getContextFor(this.name, scope, this.ancestor);
+            if (!context || typeof context.cycle != 'function' || this.name !== 'cycleValue' || this.args.length === 0) {
+                throw new Error("Binding expression \"" + this + "\" cannot be assigned to.");
+            }
+            var name = this.args[0].evaluate(scope, lookupFunctions, true);
+            logger.debug(context, 'will set', name, 'to', value);
+            triggerObservers(name, value, context);
+        };
+        var callScopeEvaluate = aurelia_binding_1.CallScope.prototype.evaluate;
+        aurelia_binding_1.CallScope.prototype.evaluate = function evaluate(scope, lookupFunctions, mustEvaluate) {
+            var context = aurelia_binding_1.getContextFor(this.name, scope, this.ancestor);
+            if (!context || typeof context.cycle != 'function' || (this.name !== 'cycleValue' && this.name !== 'cycleAction') || this.args.length === 0) {
+                return callScopeEvaluate.apply(this, arguments);
+            }
+            var name = this.args[0].evaluate(scope, lookupFunctions, true);
+            if (this.name === 'cycleAction') {
+                var args = evalList(scope, Array.from(this.args).slice(1), lookupFunctions);
+                var event_1 = scope.overrideContext.$event;
+                logger.debug(context, 'event trigerred', name, args, event_1, this);
+                triggerObservers(name, { event: event_1, arguments: args }, context);
+                return;
+            }
+            logger.debug(context, 'getting value to set in the view', name, this);
+            if (name in context)
+                return context[name];
+        };
+        function getOrCreateObservable(name, context, hasValue) {
+            if (hasValue === void 0) { hasValue = true; }
+            var observable = context.observables.get(name);
+            if (!observable) {
+                var observers_1 = new Set();
+                observable = Rx_1.Observable.create(function (observer) {
+                    observers_1.add(observer);
+                    return function () {
+                        observers_1.delete(observer);
+                    };
+                });
+                if (hasValue) {
+                    observable._cycleType = 'value';
+                    var storeValueCacheSubscription = observable.subscribe(function (value) { return context[name] = value; });
+                }
+                else {
+                    observable._cycleType = 'action';
+                }
+                context.observables.set(name, observable);
+                context.observers.set(name, observers_1);
+            }
+            return observable;
+        }
+        aurelia_binding_1.CallScope.prototype.bind = function bind(binding, scope, lookupFunctions) {
+            var expression = binding.sourceExpression;
+            if (expression.name == 'cycleValue' || expression.name == 'cycleAction') {
+                var context = aurelia_binding_1.getContextFor(expression.name, scope, expression.ancestor);
+                var name_2 = expression.args[0].evaluate(scope, lookupFunctions, true);
+                logger.debug('store the updateTarget for', name_2, context, binding);
+                var observable = getOrCreateObservable(name_2, context, expression.name == 'cycleValue');
+            }
+        };
+        aurelia_binding_1.CallScope.prototype.unbind = function unbind(binding, scope) {
+            var expression = binding.sourceExpression;
+            if (expression.name == 'cycleValue') {
+                expression._unbind();
+            }
+        };
     }
     exports.configure = configure;
     function invokeAureliaBindingSetter(context, name, value) {
-        var previousValue = context.aureliaViewValues.get(name);
+        var previousValue = context[name];
         if (previousValue !== value) {
-            var propertyViewSetters = context.propertyViewSetters;
-            var setter = propertyViewSetters.get(name);
-            if (setter)
-                setter(value);
-            else
-                logger.error("the binding (" + name + ") is not a two-way binding and you cannot set it!");
+            var observers = context.observers;
+            observers.get(name).forEach(function (observer) { return observer.next(value); });
         }
     }
     function getAureliaObservableForBinding(context, name) {
-        var aureliaFromViewObservables = context.aureliaFromViewObservables;
-        var aureliaToViewObservables = context.aureliaToViewObservables;
-        var fromView = aureliaFromViewObservables.get(name);
-        var toView = aureliaToViewObservables.get(name);
-        var returnObservable = toView && fromView ? Rx_1.Observable.merge(fromView, toView) : toView || fromView;
-        returnObservable._aureliaType = fromView ? fromView._aureliaType : 'property';
-        return returnObservable;
+        var observables = context.observables;
+        return observables.get(name);
     }
@@ -64,4 +145,4 @@ function makeAureliaDriver(context) {
                     var observable = getAureliaObservableForBinding(context, bindingName);
-                    if (!observable || observable._aureliaType != 'property')
-                        throw new Error("Cannot select an unexistent binding " + bindingName);
+                    if (!observable || observable._cycleType != 'value')
+                        throw new Error("Cannot select a non-existent value binding " + bindingName);
                     return observable;
@@ -71,4 +152,4 @@ },
                     var observable = getAureliaObservableForBinding(context, bindingName);
-                    if (!observable || observable._aureliaType != 'action')
-                        throw new Error("Cannot select an unexistent binding " + bindingName);
+                    if (!observable || observable._cycleType != 'action')
+                        throw new Error("Cannot select a non-existent action binding " + bindingName);
                     return observable;
@@ -80,10 +161,6 @@ },
         driverCreator.streamAdapter = index_2.default;
-        if (!context.propertyViewSetters)
-            context.propertyViewSetters = new Map();
-        if (!context.aureliaFromViewObservables)
-            context.aureliaFromViewObservables = new Map();
-        if (!context.aureliaToViewObservables)
-            context.aureliaToViewObservables = new Map();
-        if (!context.aureliaViewValues)
-            context.aureliaViewValues = new Map();
+        if (!context.observables)
+            context.observables = new Map();
+        if (!context.observers)
+            context.observers = new Map();
         if (!context.cycleStarted || !context.cycleStartedResolve)
@@ -94,129 +171,16 @@ context.cycleStarted = new Promise(function (resolve) { return context.cycleStartedResolve = resolve; });
     exports.makeAureliaDriver = makeAureliaDriver;
-    var interceptMethods = ['updateTarget', 'updateSource', 'callSource'];
-    var CycleBindingBehavior = (function () {
-        function CycleBindingBehavior() {
+    var evalListCache = [[], [0], [0, 0], [0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0, 0]];
+    function evalList(scope, list, lookupFunctions) {
+        var length = list.length, cacheLength, i;
+        for (cacheLength = evalListCache.length; cacheLength <= length; ++cacheLength) {
+            evalListCache.push([]);
         }
-        CycleBindingBehavior.prototype.bind = function (binding, scope, name) {
-            var context = scope.overrideContext.bindingContext;
-            var expression = binding.sourceExpression.expression;
-            var firstExpression = expression.expression || expression;
-            if (!name) {
-                var maxNesting = 10;
-                while (!firstExpression.name && maxNesting--) {
-                    firstExpression = firstExpression.left;
-                }
-                name = firstExpression.name;
-            }
-            logger.debug("Creating Cycle binding for '" + name + "' via interception");
-            var toViewObservers = new Set();
-            var toViewObservable = Rx_1.Observable.create(function (observer) {
-                toViewObservers.add(observer);
-                return function () {
-                    toViewObservers.delete(observer);
-                };
-            });
-            binding.toViewObservable = toViewObservable;
-            binding.toViewObservers = toViewObservers;
-            context.aureliaToViewObservables.set(name, toViewObservable);
-            var toViewSubscription;
-            if (binding['updateTarget']) {
-                var method = 'updateTarget';
-                binding[("cycle-intercepted-" + method)] = binding[method];
-                var updateBindingValueInView_1 = binding[method].bind(binding);
-                toViewSubscription = toViewObservable.subscribe(function (value) {
-                    updateBindingValueInView_1(value);
-                }, function (error) { return logger.error("Error in a toViewObservable binding for " + name); });
-                var toViewObserversNextAll_1 = function (value) {
-                    toViewObservers.forEach(function (observer) { return observer.next(value); });
-                };
-                binding[method] = function (value) {
-                    context.cycleStarted.then(function () {
-                        if (value !== undefined) {
-                            logger.debug("an initial value was seeded to the observable: " + name + " = '" + value + "'");
-                            toViewObserversNextAll_1(value);
-                        }
-                    });
-                };
-                context.propertyViewSetters.set(name, toViewObserversNextAll_1);
-            }
-            var allChanges = toViewObservable;
-            if (binding['updateSource'] || binding['callSource']) {
-                var fromViewObservers_1 = new Set();
-                var fromViewObservable = Rx_1.Observable.create(function (observer) {
-                    fromViewObservers_1.add(observer);
-                    return function () {
-                        fromViewObservers_1.delete(observer);
-                    };
-                });
-                binding.fromViewObservable = fromViewObservable;
-                binding.fromViewObservers = fromViewObservers_1;
-                context.aureliaFromViewObservables.set(name, fromViewObservable);
-                if (binding['updateSource']) {
-                    var method = 'updateSource';
-                    binding[("cycle-intercepted-" + method)] = binding[method];
-                    binding[method] = function (value) {
-                        fromViewObservers_1.forEach(function (observer) { return observer.next(value); });
-                    };
-                    fromViewObservable['_aureliaType'] = 'property';
-                    allChanges = Rx_1.Observable.merge(fromViewObservable, toViewObservable);
-                }
-                if (binding['callSource']) {
-                    var method = 'callSource';
-                    binding[("cycle-intercepted-" + method)] = binding[method];
-                    var args_1 = firstExpression.args;
-                    binding[method] = function ($event) {
-                        var evaluatedArgs = [];
-                        for (var _i = 0, args_2 = args_1; _i < args_2.length; _i++) {
-                            var arg = args_2[_i];
-                            evaluatedArgs.push(arg.evaluate(binding.source, binding.lookupFunctions, true));
-                        }
-                        fromViewObservers_1.forEach(function (observer) { return observer.next({ event: event, arguments: evaluatedArgs }); });
-                    };
-                    fromViewObservable['_aureliaType'] = 'action';
-                }
-            }
-            if (binding['updateSource'] || binding['updateTarget']) {
-                binding.allChangesObservable =
-                    allChanges.subscribe(function (value) {
-                        context.aureliaViewValues.set(name, value);
-                    }, function (error) { return logger.error(error.message); }, function () {
-                        logger.debug("completed allChangesObservable for " + name);
-                        binding.allChangesObservable = undefined;
-                    });
-            }
-        };
-        CycleBindingBehavior.prototype.unbind = function (binding, scope) {
-            var i = interceptMethods.length;
-            while (i--) {
-                var method = interceptMethods[i];
-                if (!binding[method]) {
-                    continue;
-                }
-                binding[method] = binding[("cycle-intercepted-" + method)];
-                binding[("cycle-intercepted-" + method)] = undefined;
-            }
-            if (binding.toViewObservable) {
-                binding.toViewObservers.forEach(function (observer) { return observer.complete(); });
-                binding.toViewObservers = undefined;
-                binding.toViewObservable = undefined;
-            }
-            if (binding.fromViewObservable) {
-                binding.fromViewObservers.forEach(function (observer) { return observer.complete(); });
-                binding.fromViewObservers = undefined;
-                binding.fromViewObservable = undefined;
-            }
-        };
-        return CycleBindingBehavior;
-    }());
-    exports.CycleBindingBehavior = CycleBindingBehavior;
-    function cycle(potentialTarget) {
-        var deco = function (target) {
-            console.log('cycle decorator', target);
-            target.useCycle = true;
-        };
-        return potentialTarget ? deco(potentialTarget) : deco;
+        var result = evalListCache[length];
+        for (i = 0; i < length; ++i) {
+            result[i] = list[i].evaluate(scope, lookupFunctions);
+        }
+        return result;
     }
-    exports.cycle = cycle;
 });
 //# sourceMappingURL=index.js.map
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"/source/","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":[]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"/source/","sources":["index.ts"],"names":[],"mappings":";;IAuBA,IAAM,MAAM,GAAG,8BAAU,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAGxD,mBAA0B,eAAuC;QAU/D,IAAM,YAAY,GAAiB,yBAAI,CAAC,SAAS,CAAC,IAAI,CAAA;QAEtD,yBAAI,CAAC,SAAS,CAAC,IAAI,GAAG,cAAc,OAAY,EAAE,eAAwB,EAAE,aAAuB;YACjG,IAAI,OAAO,CAAA;YAEX,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC;gBAClD;oBACE,MAAM,CAAC,UAAE,GAAC,OAAO,CAAC,WAAW,CAAC,IAAI,GAAG,MAAM,CAAC,GAAE,iBAAiB,CAAC,OAAO,CAAC,KAAE,CAAA;;gBAC5E,CAAC;gBAGD,OAAO,GAAG,OAAO,CAAC,YAAY,CAAA;gBAG9B,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC;oBAC1C,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC;wBAClD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;gBAE/C,CAAC;gBAAC,IAAI,CAAC,CAAC;oBAEN,OAAO,GAAG,iBAAiB,EAAE,CAAA;gBAC/B,CAAC;YACH,CAAC;YAED,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YAGnC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBAGZ,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAA;gBAE/C,OAAO,CAAC,mBAAmB,EAAE,CAAA;YAE/B,CAAC;QACH,CAAC,CAAA;QAOD,IAAM,gBAAgB,GAAa,2BAAS,CAAC,SAAS,CAAC,OAAO,CAAA;QAC9D,2BAAS,CAAC,SAAS,CAAC,OAAO,GAAG,iBAAiB,OAAsB,EAAE,KAAY;YACjF,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;YAE9C,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;gBAC5C,IAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAA;gBACpC,IAAM,MAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;gBACxE,IAAM,UAAU,GAAG,qBAAqB,CAAC,MAAI,EAAE,OAAO,CAAC,CAAA;gBACvD,UAAU,CAAC,SAAS,CAClB,UAAC,KAAK;oBAEJ,IAAI,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;oBAC7F,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;gBACpC,CAAC,EACD,UAAC,KAAK,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,uBAAqB,MAAM,EAAE,KAAK,CAAC,EAAhD,CAAgD,EAC3D,cAAM,OAAA,MAAM,CAAC,KAAK,CAAC,oBAAkB,MAAI,cAAW,CAAC,EAA/C,CAA+C,CACtD,CAAA;YAKH,CAAC;QAQH,CAAC,CAAA;QAED,IAAM,oBAAoB,GAAa,2BAAS,CAAC,SAAS,CAAC,WAAW,CAAA;QACtE,2BAAS,CAAC,SAAS,CAAC,WAAW,GAAG;YAChC,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAC1B,CAAC,CAAA;QAED,0BAA0B,IAAW,EAAE,KAAgB,EAAE,OAAO;YAC9D,IAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAA6B,CAAA;YACzE,EAAE,CAAC,CAAC,SAAS,CAAC;gBACZ,SAAS,CAAC,OAAO,CAAC,UAAA,QAAQ,IAAI,OAAA,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAApB,CAAoB,CAAC,CAAA;YACrD,IAAI;gBACF,MAAM,CAAC,KAAK,CAAC,gCAA8B,IAAI,mBAAgB,CAAC,CAAA;QACpE,CAAC;QAED,2BAAS,CAAC,SAAS,CAAC,MAAM,GAAG,gBAAgB,KAAY,EAAE,KAAU,EAAE,eAAoB;YAEzF,IAAM,OAAO,GAAG,+BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC9D,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC3G,MAAM,IAAI,KAAK,CAAC,0BAAuB,IAAI,8BAA0B,CAAC,CAAC;YACzE,CAAC;YAED,IAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;YAChE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;YACpD,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,IAAM,iBAAiB,GAAa,2BAAS,CAAC,SAAS,CAAC,QAAQ,CAAA;QAChE,2BAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,kBAAkB,KAAY,EAAE,eAAe,EAAE,YAAqB;YACnG,IAAM,OAAO,GAAG,+BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC9D,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,KAAK,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5I,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YACjD,CAAC;YAED,IAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;YAChE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;gBAChC,IAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAA;gBAC7E,IAAM,OAAK,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,CAAA;gBAC1C,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,OAAK,EAAE,IAAI,CAAC,CAAA;gBACjE,gBAAgB,CAAC,IAAI,EAAE,EAAE,OAAA,OAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAA;gBAE3D,MAAM,CAAA;YACR,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,kCAAkC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAGrE,EAAE,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC;gBAClB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAUxB,CAAC,CAAA;QAED,+BAA+B,IAAY,EAAE,OAAO,EAAE,QAAe;YAAf,wBAAe,GAAf,eAAe;YACnE,IAAI,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAA8C,CAAA;YAC3F,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;gBAChB,IAAM,WAAS,GAAG,IAAI,GAAG,EAAoB,CAAA;gBAC7C,UAAU,GAAG,eAAU,CAAC,MAAM,CAAC,UAAU,QAA0B;oBAEjE,WAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;oBAEvB,MAAM,CAAC;wBAEL,WAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAC5B,CAAC,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACb,UAAU,CAAC,UAAU,GAAG,OAAO,CAAA;oBAC/B,IAAM,2BAA2B,GAAiB,UAAU,CAAC,SAAS,CACpE,UAAA,KAAK,IAAI,OAAA,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,EAArB,CAAqB,CAI/B,CAAA;gBACH,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACN,UAAU,CAAC,UAAU,GAAG,QAAQ,CAAA;gBAClC,CAAC;gBAED,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;gBACzC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,WAAS,CAAC,CAAA;YAExC,CAAC;YACD,MAAM,CAAC,UAAU,CAAA;QACnB,CAAC;QAED,2BAAS,CAAC,SAAS,CAAC,IAAI,GAAG,cAAc,OAAsB,EAAE,KAAY,EAAE,eAAe;YAC5F,IAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAA;YAG3C,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,YAAY,IAAI,UAAU,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC;gBACxE,IAAM,OAAO,GAAG,+BAAa,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;gBAC1E,IAAM,MAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;gBAEtE,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,MAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;gBAElE,IAAM,UAAU,GAAG,qBAAqB,CAAC,MAAI,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,IAAI,YAAY,CAAC,CAAA;YAU1F,CAAC;QAIH,CAAC,CAAA;QAED,2BAAS,CAAC,SAAS,CAAC,MAAM,GAAG,gBAAgB,OAAO,EAAE,KAAY;YAChE,IAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAA;YAE3C,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;gBACpC,UAAU,CAAC,OAAO,EAAE,CAAA;YAKtB,CAAC;QAIH,CAAC,CAAA;IAGH,CAAC;IA1Ne,iBAAS,YA0NxB,CAAA;IAwBD,oCAAoC,OAAY,EAAE,IAAY,EAAE,KAAa;QAE3E,IAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAEnC,EAAE,CAAC,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC;YAS5B,IAAM,SAAS,GAAG,OAAO,CAAC,SAA0C,CAAA;YACpE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAA,QAAQ,IAAI,OAAA,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAApB,CAAoB,CAAC,CAAA;QAM/D,CAAC;IAIH,CAAC;IAED,wCAAwC,OAAY,EAAE,IAAY;QAChE,IAAM,WAAW,GAAsB,OAAO,CAAC,WAAW,CAAA;QAC1D,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAW9B,CAAC;IAMD,2BAAkC,OAAY;QAG5C,IAAM,aAAa,GAAmB,uBAAuB,MAAM;YACjE,MAAM,CAAC,SAAS,CAAC,UAAC,QAAQ;gBACxB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAA,QAAQ;oBACpC,IAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;oBACnC,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACzD,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAM,aAAa,GAAG;gBACpB,MAAM,EAAE,gBAAgB,WAAmB;oBACzC,IAAM,UAAU,GAAG,8BAA8B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;oBACvE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,IAAI,OAAO,CAAC;wBAClD,MAAM,IAAI,KAAK,CAAC,gDAA8C,WAAa,CAAC,CAAA;oBAC9E,MAAM,CAAC,UAAU,CAAA;gBACnB,CAAC;gBACD,OAAO,EAAE,iBAAiB,WAAmB;oBAC3C,IAAM,UAAU,GAAG,8BAA8B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;oBACvE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,IAAI,QAAQ,CAAC;wBACnD,MAAM,IAAI,KAAK,CAAC,iDAA+C,WAAa,CAAC,CAAA;oBAC/E,MAAM,CAAC,UAAU,CAAA;gBACnB,CAAC;aACF,CAAA;YACD,MAAM,CAAC,aAAa,CAAA;QACtB,CAAC,CAAA;QAED,aAAa,CAAC,aAAa,GAAG,eAAW,CAAA;QAezC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YACvB,OAAO,CAAC,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAA;QAE1D,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,OAAO,CAAC,SAAS,GAAG,IAAI,GAAG,EAAyB,CAAA;QAEtD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;YACxD,OAAO,CAAC,YAAY,GAAG,IAAI,OAAO,CAAO,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,mBAAmB,GAAG,OAAO,EAArC,CAAqC,CAAC,CAAA;QAE9F,MAAM,CAAC,aAAa,CAAA;IACtB,CAAC;IArDe,yBAAiB,oBAqDhC,CAAA;IAUD,IAAI,aAAa,GAAG,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,kBAAkB,KAAK,EAAE,IAAI,EAAE,eAAe;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,EACpB,WAAW,EAAE,CAAC,CAAC;QAEnB,GAAG,CAAC,CAAC,WAAW,GAAG,aAAa,CAAC,MAAM,EAAE,WAAW,IAAI,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC;YAC9E,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAEnC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,CAAC,MAAM,CAAC;IAChB,CAAC","sourcesContent":[]}

package.json

 {
   "name": "aurelia-cycle",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "An Aurelia plugin that enables the use of Cycle.js inside of Aurelia.",
@@ -5,0 +5,0 @@ "keywords": [

README.md

@@ -54,9 +54,9 @@ # aurelia-cycle
 
-To make bindings visible to the driver you need to apply the `cycle` Binding Behavior to them as shown below:
+To make bindings visible to the driver you need to refer to them as if they're either `cycleValue('yourName')` or `cycleAction('yourName')` as shown below:
 
 ```html
 <template>
-  <h2>${count & cycle}</h2>
-  <button click.delegate="increment() & cycle">+</button>
-  <button click.delegate="decrement() & cycle">-</button>
+  <h2>${cycleValue('count')}</h2>
+  <button click.delegate="cycleAction('increment')">+</button>
+  <button click.delegate="cycleAction('decrement')">-</button>
 </template>
@@ -63,0 +63,0 @@ ```

src/index.ts

@@ -1,2 +0,3 @@
-import {View} from 'aurelia-templating';
+import {CallScope, Scope, getContextFor, Binding, Expression} from 'aurelia-binding'
+import {View} from 'aurelia-templating'
 import {Observable, Observer, Subscription} from 'rxjs/Rx'
@@ -6,14 +7,32 @@ import Cycle from '@cycle/core/lib/index'
 import { DriverFunction } from '@cycle/base'
+import {Aurelia, LogManager, FrameworkConfiguration} from 'aurelia-framework';
 
-import * as TheLogManager from 'aurelia-logging'
+// for returning data to other cycles (like clicks on a delete button)
+// it would be great to have a shared context
+// actions / values should have { event, arguments, context }
+// then there are an aggregate observables that contain data of all objects
+// so you can have a SharedAureliaDriver
+// Shared.select(TodoItem).actions('destroy')
 
+// actually, with @bindable you could theoretically also bind action triggers
+// so maybe it's not necesary to have a shared context after all? 
+
+// import * as TheLogManager from 'aurelia-logging'
+
 // export { default as Cycle } from '@cycle/core/lib/index'
 // export { Subject, Scheduler, Observable, Observer, Operator, Subscriber, Subscription, Symbol, AsyncSubject, ReplaySubject, BehaviorSubject, ConnectableObservable, Notification, EmptyError, ArgumentOutOfRangeError, ObjectUnsubscribedError, UnsubscriptionError } from 'rxjs/Rx'
 
-const logger = TheLogManager.getLogger('aurelia-cycle')
+const logger = LogManager.getLogger('aurelia-cycle-new')
+// const logger = TheLogManager.getLogger('aurelia-cycle-new')
 
-export function configure(frameworkConfig) {
-  const bindingBehaviorInstance = frameworkConfig.container.get(CycleBindingBehavior)
-  frameworkConfig.aurelia.resources.registerBindingBehavior('cycle', bindingBehaviorInstance) //new CycleBindingBehavior()
+export function configure(frameworkConfig: FrameworkConfiguration) {
+  // const bindingBehaviorInstance = frameworkConfig.container.get(CycleBindingBehavior)
+  // frameworkConfig.aurelia.resources.registerBindingBehavior('cycle', bindingBehaviorInstance) //new CycleBindingBehavior()
   
+  // TODO: investigate:
+  // frameworkConfig.aurelia.resources.registerViewEngineHooks({ 
+  //   beforeCreate: ()=>{ logger.debug('before view create') }, 
+  //   afterCreate: ()=>{ logger.debug('after view create') } 
+  // })
+
   const originalBind:(scope)=>void = View.prototype.bind
@@ -23,3 +42,3 @@
     let sources
-    
+    // logger.debug('before bind')
     if (context && typeof context.cycle == 'function') {
@@ -30,3 +49,3 @@ function getDefaultSources() {
       
-      // console.log('sources', context, context.cycleDrivers, scope)
+      // logger.debug('sources', context, context.cycleDrivers, scope)
       sources = context.cycleDrivers
@@ -46,2 +65,3 @@ // logger.debug('starting post-binding for cycle hook', sources, typeof sources, context.constructor.name + 'View', context.constructor.name + 'View' in sources)
     originalBind.apply(this, arguments)
+    // logger.debug('after bind')
     
@@ -58,27 +78,200 @@ if (sources) {
   
-  /*
-  const originalEnsurePropertiesDefined = HtmlBehaviorResource.prototype._ensurePropertiesDefined
-  HtmlBehaviorResource.prototype._ensurePropertiesDefined = function _ensurePropertiesDefined(instance: Object, lookup: Object) {
-    logger.debug('HtmlBehaviorResource', instance, lookup, this, this.properties)
-    originalEnsurePropertiesDefined.apply(this, arguments)    
+  // const bindingBind: Function = Binding.prototype.bind
+  // Binding.prototype.bind = function bind(source: Scope) {
+  //   bindingBind.apply(this, arguments)
+  //   console.log('binding', this)
+  // }
+  const callScopeConnect: Function = CallScope.prototype.connect
+  CallScope.prototype.connect = function connect(binding: Binding & any, scope: Scope) {
+    callScopeConnect.apply(this, arguments)
+    console.log('connected', binding, scope, this)
+    // binding.call()
+    if (this.name == 'cycleValue') {
+      console.log('we have a cycleValue connect!')
+      const context = scope.bindingContext
+      const name = this.args[0].evaluate(scope, binding.lookupFunctions, true)
+      const observable = getOrCreateObservable(name, context)
+      observable.subscribe(
+        (value) => {
+          // this.updateTarget(value) // update CallScope value
+          let bindingValue = binding.sourceExpression.evaluate(binding.source, binding.lookupFunctions)
+          binding.updateTarget(bindingValue) // update the whole binding
+        }, 
+        (error) => logger.error(`binding error for ${name}`, error), 
+        () => logger.debug(`observable for ${name} complete`)
+      )
+      // setInterval(() => {
+      //   let value = binding.sourceExpression.evaluate(binding.source, binding.lookupFunctions)
+      //   binding.updateTarget(value)
+      // }, 1000)
+    }
+    // binding.
+    // let args = this.args;
+    // let i = args.length;
+    // while (i--) {
+    //   args[i].connect(binding, scope);
+    // }
+    // todo: consider adding `binding.observeProperty(scope, this.name);`
   }
-  */
+  
+  const callScopeConstructor: Function = CallScope.prototype.constructor
+  CallScope.prototype.constructor = function() {
+    callScopeConstructor.apply(this, arguments)
+    this.isAssignable = true
+  }
+  
+  function triggerObservers(name:string, value: ViewValue, context) {
+    const observers = context.observers.get(name) as Set<Observer<ViewValue>>
+    if (observers)
+      observers.forEach(observer => observer.next(value)) // maybe we need to add origin?
+    else
+      logger.error(`no observer set exists for ${name} cycle binding`)
+  }
+  
+  CallScope.prototype.assign = function assign(scope: Scope, value: any, lookupFunctions: any): any {
+    // if (!context.cycle) {
+    const context = getContextFor(this.name, scope, this.ancestor)
+    if (!context || typeof context.cycle != 'function' || this.name !== 'cycleValue' || this.args.length === 0) {
+      throw new Error(`Binding expression "${this}" cannot be assigned to.`);
+    }
+    // const context = scope.bindingContext
+    const name = this.args[0].evaluate(scope, lookupFunctions, true)
+    logger.debug(context, 'will set', name, 'to', value)
+    triggerObservers(name, value, context)
+  }
+  
+  const callScopeEvaluate: Function = CallScope.prototype.evaluate
+  CallScope.prototype.evaluate = function evaluate(scope: Scope, lookupFunctions, mustEvaluate: boolean) {
+    const context = getContextFor(this.name, scope, this.ancestor)
+    if (!context || typeof context.cycle != 'function' || (this.name !== 'cycleValue' && this.name !== 'cycleAction') || this.args.length === 0) {
+      return callScopeEvaluate.apply(this, arguments)
+    }
+    // const context = scope.bindingContext
+    const name = this.args[0].evaluate(scope, lookupFunctions, true)
+    if (this.name === 'cycleAction') {
+      const args = evalList(scope, Array.from(this.args).slice(1), lookupFunctions)
+      const event = scope.overrideContext.$event
+      logger.debug(context, 'event trigerred', name, args, event, this)
+      triggerObservers(name, { event, arguments: args }, context)
+      // NOTE: if this returns true, it can leave propagation
+      return
+    }
+    logger.debug(context, 'getting value to set in the view', name, this)
+    // no it's own we shouldn't return anything;
+    // instead we will use propertyViewSetters directly to set the value of this binding
+    if (name in context)
+      return context[name]
+    // context.aureliaViewValues.get(name)
+    // 'awesome'
+    
+    // let args = evalList(scope, this.args, lookupFunctions);
+    // let func = getFunction(context, this.name, mustEvaluate);
+    // if (func) {
+    //   return func.apply(context, args);
+    // }
+    // return undefined;
+  }
+  
+  function getOrCreateObservable(name: string, context, hasValue = true) {
+    let observable = context.observables.get(name) as Observable<any> & ObservableTypeExtension
+    if (!observable) {
+      const observers = new Set<Observer<string>>()
+      observable = Observable.create(function (observer: Observer<string>) {
+        // logger.debug('Creating toView binding observable for:', name)
+        observers.add(observer)
+        // Any cleanup logic might go here
+        return function () {
+          // logger.debug('disposed of toView observable for', name)
+          observers.delete(observer)
+        }
+      })
+      
+      if (hasValue) {
+        observable._cycleType = 'value'
+        const storeValueCacheSubscription: Subscription = observable.subscribe(
+          value => context[name] = value
+          // value => context.aureliaViewValues.set(name, value)
+          // undefined, 
+          // () => storeValueCacheSubscription.unsubscribe()
+        )
+      } else {
+        observable._cycleType = 'action'        
+      }
+      
+      context.observables.set(name, observable)
+      context.observers.set(name, observers)
+      // storeValueSubscription.
+    }
+    return observable
+  }
+  
+  CallScope.prototype.bind = function bind(binding: Binding & any, scope: Scope, lookupFunctions) {
+    const expression = binding.sourceExpression // as Expression & { name:string, ancestor:any, args:Array<Expression>, _unbind:()=>void }
+    // const name = expression.name // act only if 'cycleValue'
+    // console.log('binding', binding)
+    if (expression.name == 'cycleValue' || expression.name == 'cycleAction') {
+      const context = getContextFor(expression.name, scope, expression.ancestor)
+      const name = expression.args[0].evaluate(scope, lookupFunctions, true)
+      // store the update method:
+      logger.debug('store the updateTarget for', name, context, binding)
+      // setTimeout(() => binding.updateTarget('ho ho ho'), 2000)
+      const observable = getOrCreateObservable(name, context, expression.name == 'cycleValue')
+      // observable.subscribe(
+      //   (value) => binding.updateTarget(value), 
+      //   (error) => logger.error(`binding error for ${name}`, error), 
+      //   () => logger.debug(`observable for ${name} complete`)
+      // )
+      
+      // const propertyViewSetters = context.propertyViewSetters as Map<string, Function>
+      // propertyViewSetters.set(name, binding.updateTarget.bind(binding))
+      // expression._unbind = () => propertyViewSetters.delete(name)
+    }
+    
+    // should we?
+    // binding.targetObserver = { subscribe(){ }, unsubscribe() { } } 
+  }
+  
+  CallScope.prototype.unbind = function unbind(binding, scope: Scope) {
+    const expression = binding.sourceExpression
+    // const name = expression.name // act only if 'cycleValue'
+    if (expression.name == 'cycleValue') {
+      expression._unbind()
+      // const context = getContextFor(expression.name, scope, expression.ancestor)
+      // const name = expression.args[0].evaluate(scope, lookupFunctions, true)
+      // store the update method:
+      // logger.debug('store the updateTarget for', name, context, binding.updateTarget)
+    }
+    
+    // should we?
+    // binding.targetObserver = { subscribe(){ }, unsubscribe() { } } 
+  }
+  
+  
 }
 
-export type PropertyViewSetterMap = Map<string, (value)=>void>;
-export type ViewObservable = Observable<string | number>;
+export type Action = { event: AnyEvent, arguments: Array<any> };
+export type Value = string | number
+export type ViewValue = Action | Value
 
-export type FromViewActionObservable = Observable<Action> & { _aureliaType: 'action' | 'property' };
-export type FromViewValueObservable = ViewObservable & { _aureliaType: 'action' | 'property' };
+// export type ViewObservable = Observable<string | number>;
 
-export type FromViewObservable = FromViewActionObservable | FromViewValueObservable;
-export type FromViewObservableMap = Map<string, FromViewObservable>;
+export type ObservableTypeExtension = { _cycleType: 'action' | 'value' };
+
+export type ActionObservable = Observable<Action> & ObservableTypeExtension;
+export type ValueObservable = Observable<Value> & ObservableTypeExtension;
+// export type ViewObservable = ActionObservable | ValueObservable;
+export type ViewObservable = (Observable<Action> | Observable<Value>) & ObservableTypeExtension;
 export type ViewObservableMap = Map<string, ViewObservable>;
-export type ViewValues = Map<string, string | number>;
+
+// export type ViewObservableMap = Map<string, ViewObservable>;
 export type AnyEvent = Event | FocusEvent | GamepadEvent | HashChangeEvent | KeyboardEvent | MessageEvent | MouseEvent | MouseWheelEvent | MSGestureEvent | MSManipulationEvent | MSMediaKeyMessageEvent | MSMediaKeyNeededEvent | MSSiteModeEvent | MutationEvent | NavigationCompletedEvent | NavigationEvent | NavigationEventWithReferrer | OfflineAudioCompletionEvent | PageTransitionEvent | PermissionRequestedEvent | PointerEvent | PopStateEvent | ProgressEvent | ScriptNotifyEvent | StorageEvent | SVGZoomEvent | TextEvent | TouchEvent | TrackEvent | TransitionEvent | UIEvent | UnviewableContentIdentifiedEvent | WebGLContextEvent | WheelEvent;
-export type Action = { event: AnyEvent, arguments: Array<any> };
-export type ViewSource = { values: (bindingName: string) => FromViewValueObservable, actions: (bindingName: string) => FromViewActionObservable };
 
+export type ViewSource = { values: (bindingName: string) => ValueObservable, actions: (bindingName: string) => ActionObservable };
+
+
+//////////////////////////
+
 function invokeAureliaBindingSetter(context: any, name: string, value: string) {
-  const previousValue = context.aureliaViewValues.get(name)
+  // const previousValue = context.aureliaViewValues.get(name)
+  const previousValue = context[name]
   
@@ -93,10 +286,10 @@ if (previousValue !== value) {
     
-    const propertyViewSetters: PropertyViewSetterMap = context.propertyViewSetters
-    // const aureliaToViewObservables: ViewObservables = context.aureliaToViewObservables
-    
-    const setter = propertyViewSetters.get(name)
-    if (setter)
-      setter(value)
-    else
-      logger.error(`the binding (${name}) is not a two-way binding and you cannot set it!`)
+    // const propertyViewSetters: PropertyViewSetterMap = context.propertyViewSetters
+    const observers = context.observers as Map<string, Observer<string>>
+    observers.get(name).forEach(observer => observer.next(value))
+    // const setter = propertyViewSetters.get(name)
+    // if (setter)
+    //   setter(value)
+    // else
+    //   logger.error(`the binding (${name}) is not a two-way binding and you cannot set it!`)
   }
@@ -109,12 +302,14 @@ // else {
 function getAureliaObservableForBinding(context: any, name: string) {
-  const aureliaFromViewObservables: FromViewObservableMap = context.aureliaFromViewObservables
-  const aureliaToViewObservables: ViewObservableMap = context.aureliaToViewObservables
+  const observables: ViewObservableMap = context.observables
+  return observables.get(name)
+  // const aureliaFromViewObservables: FromViewObservableMap = context.aureliaFromViewObservables
+  // const aureliaToViewObservables: ViewObservableMap = context.aureliaToViewObservables
   
-  let fromView = aureliaFromViewObservables.get(name)
-  let toView = aureliaToViewObservables.get(name)
+  // let fromView = aureliaFromViewObservables.get(name)
+  // let toView = aureliaToViewObservables.get(name)
   
-  const returnObservable: FromViewObservable = toView && fromView ? Observable.merge<FromViewObservable, FromViewObservable>(fromView, toView) : toView as any || fromView
+  // const returnObservable: FromViewObservable = toView && fromView ? Observable.merge<FromViewObservable, FromViewObservable>(fromView, toView) : toView as any || fromView
   
-  returnObservable._aureliaType = fromView ? fromView._aureliaType : 'property'
-  return returnObservable
+  // returnObservable._cycleType = fromView ? fromView._cycleType : 'value'
+  // return returnObservable
 }
@@ -140,4 +335,4 @@
         const observable = getAureliaObservableForBinding(context, bindingName)
-        if (!observable || observable._aureliaType != 'property')
-          throw new Error(`Cannot select an unexistent binding ${bindingName}`)
+        if (!observable || observable._cycleType != 'value')
+          throw new Error(`Cannot select a non-existent value binding ${bindingName}`)
         return observable
@@ -147,4 +342,4 @@ },
         const observable = getAureliaObservableForBinding(context, bindingName)
-        if (!observable || observable._aureliaType != 'action')
-          throw new Error(`Cannot select an unexistent binding ${bindingName}`)
+        if (!observable || observable._cycleType != 'action')
+          throw new Error(`Cannot select a non-existent action binding ${bindingName}`)
         return observable
@@ -159,14 +354,20 @@ },
   // aurelia specific
-  if (!context.propertyViewSetters)
-    context.propertyViewSetters = new Map<string, (value)=>void>()
+  // if (!context.propertyViewSetters)
+  //   context.propertyViewSetters = new Map<string, (value)=>void>()
 
-  if (!context.aureliaFromViewObservables)
-    context.aureliaFromViewObservables = new Map<string, Observable<any>>()
+  // if (!context.aureliaFromViewObservables)
+  //   context.aureliaFromViewObservables = new Map<string, Observable<any>>()
 
-  if (!context.aureliaToViewObservables)
-    context.aureliaToViewObservables = new Map<string, Observable<any>>()
+  // if (!context.aureliaToViewObservables)
+  //   context.aureliaToViewObservables = new Map<string, Observable<any>>()
 
-  if (!context.aureliaViewValues)
-    context.aureliaViewValues = new Map<string, string>()
+  // if (!context.aureliaViewValues)
+  //   context.aureliaViewValues = new Map<string, string>()
   
+  if (!context.observables)
+    context.observables = new Map<string, Observable<any>>()
+    
+  if (!context.observers)
+    context.observers = new Map<string, Observer<any>>()
+  
   if (!context.cycleStarted || !context.cycleStartedResolve)
@@ -178,184 +379,27 @@ context.cycleStarted = new Promise<void>((resolve) => context.cycleStartedResolve = resolve)
 
-const interceptMethods = ['updateTarget', 'updateSource', 'callSource']
 
-export class CycleBindingBehavior {
-  bind(binding, scope, name) { // , param, param...
-    const context = scope.overrideContext.bindingContext // == Welcome
-    
-    const expression = binding.sourceExpression.expression
-    let firstExpression = expression.expression || expression
-    
-    if (!name) {
-      let maxNesting = 10
-      while (!firstExpression.name && maxNesting--) {
-        firstExpression = firstExpression.left
-      }
-      name = firstExpression.name
-    }
-    
-    logger.debug(`Creating Cycle binding for '${name}' via interception`)
-    
-    // TODO: don't create toView when 'callSource' type
-    
-    const toViewObservers = new Set<Observer<string>>()
-    
-    const toViewObservable:Observable<any> = Observable.create(function (observer: Observer<any>) {
-      // logger.debug('Creating toView binding observable for:', name)
-      
-      // Yield a single value and complete
-      toViewObservers.add(observer)
-      // Any cleanup logic might go here
-      return function () {
-        // logger.debug('disposed of toView observable for', name)
-        toViewObservers.delete(observer)        
-      }
-    })
 
-    binding.toViewObservable = toViewObservable
-    binding.toViewObservers = toViewObservers
-    context.aureliaToViewObservables.set(name, toViewObservable)
-    
-    let toViewSubscription: Subscription
-    
-    if (binding['updateTarget']) {
-      let method = 'updateTarget'
-      binding[`cycle-intercepted-${method}`] = binding[method]
-      
-      const updateBindingValueInView = binding[method].bind(binding);
-      
-      toViewSubscription = toViewObservable.subscribe(value => {
-        // logger.debug('updating toView', name, value)
-        updateBindingValueInView(value)
-      }, error => logger.error(`Error in a toViewObservable binding for ${name}`))
-      
-      const toViewObserversNextAll = (value) => {
-        toViewObservers.forEach(observer => observer.next(value))
-      }
-      
-      // seed default value of the binding
-      // this shouldn't happen more than once (?)
-      // update is the "setter" for the View
-      // binding[method] = toViewObserversNextAll
-      binding[method] = (value) => {
-        context.cycleStarted.then(() => {
-          // don't seed an initial value if it is undefined
-          if (value !== undefined) {
-            logger.debug(`an initial value was seeded to the observable: ${name} = '${value}'`)
-            toViewObserversNextAll(value)
-          }
-        })
-        // toViewObservers.forEach(observer => observer.next(value))
-      }
-      
-      context.propertyViewSetters.set(name, toViewObserversNextAll)
-    }
-    
-    let allChanges = toViewObservable
-    
-    if (binding['updateSource'] || binding['callSource']) {
-      let fromViewObservers = new Set<Observer<string|{event; arguments}>>()
-      
-      const fromViewObservable:Observable<any> = Observable.create(function (observer: Observer<any>) {
-        // logger.debug('Creating fromView binding observable for:', name)
-        // Yield a single value and complete
-        fromViewObservers.add(observer)
-        // Any cleanup logic might go here
-        return function () {
-          // logger.debug('disposed of fromView observable for', name)
-          fromViewObservers.delete(observer)
-        }
-      })
-      
-      binding.fromViewObservable = fromViewObservable
-      binding.fromViewObservers = fromViewObservers
-      context.aureliaFromViewObservables.set(name, fromViewObservable)
-      
-      if (binding['updateSource']) {
-        let method = 'updateSource'
-        binding[`cycle-intercepted-${method}`] = binding[method];
-        // user input - we don't need to change the underlying ViewModel, 
-        // since we don't plan on using it
-        //
-        // we seed the value as user input to the observable 
-        
-        binding[method] = (value) => {
-          // logger.debug('you changed the value of', name, value)
-          fromViewObservers.forEach(observer => observer.next(value))
-        }
-        
-        fromViewObservable['_aureliaType'] = 'property'
-        allChanges = Observable.merge(fromViewObservable, toViewObservable)
-      }
-      
-      if (binding['callSource']) {
-        let method = 'callSource'
-        binding[`cycle-intercepted-${method}`] = binding[method]
-        // triggers and delegates should be considered user input
-        
-        const args = firstExpression.args
-        
-        binding[method] = ($event) => {
-          let evaluatedArgs = []
-          for (let arg of args) {
-            evaluatedArgs.push(arg.evaluate(binding.source, binding.lookupFunctions, true))
-          }
-          // logger.debug('you invoked a method', name, event, evaluatedArgs)
-          fromViewObservers.forEach(observer => observer.next({ event, arguments: evaluatedArgs }))          
-        }
-        
-        fromViewObservable['_aureliaType'] = 'action'
-      }
-    }
-    
-    if (binding['updateSource'] || binding['updateTarget']) {
-      binding.allChangesObservable = 
-        allChanges.subscribe(
-          (value) => {
-            // logger.debug('a value was set', name, value)
-            context.aureliaViewValues.set(name, value)
-          }, 
-          (error) => logger.error(error.message), 
-          () => {
-            logger.debug(`completed allChangesObservable for ${name}`)
-            binding.allChangesObservable = undefined
-          }
-        )
-    }
-  }
 
-  unbind(binding, scope) {
-    let i = interceptMethods.length;
-    while (i--) {
-      let method = interceptMethods[i];
-      if (!binding[method]) {
-        continue;
-      }
-      binding[method] = binding[`cycle-intercepted-${method}`];
-      binding[`cycle-intercepted-${method}`] = undefined;
-    }
-    if (binding.toViewObservable) {
-      binding.toViewObservers.forEach(observer => observer.complete())
-      binding.toViewObservers = undefined
-      binding.toViewObservable = undefined
-    }
-    if (binding.fromViewObservable) {
-      binding.fromViewObservers.forEach(observer => observer.complete())
-      binding.fromViewObservers = undefined
-      binding.fromViewObservable = undefined
-    }
+
+//////////////////////////
+
+// FROM https://github.com/aurelia/binding/blob/master/src/ast.js
+
+var evalListCache = [[],[0],[0,0],[0,0,0],[0,0,0,0],[0,0,0,0,0]];
+/// Evaluate the [list] in context of the [scope].
+function evalList(scope, list, lookupFunctions) {
+  var length = list.length,
+      cacheLength, i;
+
+  for (cacheLength = evalListCache.length; cacheLength <= length; ++cacheLength) {
+    evalListCache.push([]);
   }
-}
 
+  var result = evalListCache[length];
 
-/**
-* Decorator: Specifies that Cycle should used in the decoratored ViewModel.
-* [NOT USED AT THIS TIME]
-*/
-export function cycle(potentialTarget?: any): any {
-  let deco = function(target) {
-    console.log('cycle decorator', target)
-    target.useCycle = true
+  for (i = 0; i < length; ++i) {
+    result[i] = list[i].evaluate(scope, lookupFunctions);
   }
 
-  return potentialTarget ? deco(potentialTarget) : deco;
+  return result;
 }

No alert changes

Improved metrics

Total package byte prevSize

76373

increased by0.51%

Worsened metrics

Lines of code

1152

decreased by-0.6%

No dependency changes