chore(all): prepare release 1.3.3

aurelia · Feb 14, 2019 · ddc3680 · ddc3680
1 parent 89c12dd
commit ddc3680
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 8 deletions.
diff --git a/dist/amd/aurelia-store.js b/dist/amd/aurelia-store.js
@@ -505,9 +505,16 @@ define('aurelia-store', ['exports', 'rxjs', 'aurelia-dependency-injection', 'aur
         if (!Object.entries) {
             throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
         }
-        var store = aureliaDependencyInjection.Container.instance.get(Store);
+        var $store;
+        // const store = Container.instance.get(Store) as Store<T>;
         var _settings = __assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
         function getSource(selector) {
+            // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+            // then we have no choice but to get the store instance from global container instance
+            // otherwise, assume that $store variable in the closure would be already assigned the right
+            // value from created callback
+            // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+            var store = $store || ($store = aureliaDependencyInjection.Container.instance.get(Store));
             var source = selector(store);
             if (source instanceof rxjs.Observable) {
                 return source;
@@ -537,12 +544,26 @@ define('aurelia-store', ['exports', 'rxjs', 'aurelia-dependency-injection', 'aur
             });
         }
         return function (target) {
+            var originalCreated = target.prototype.created;
             var originalSetup = typeof settings === "object" && settings.setup
                 ? target.prototype[settings.setup]
                 : target.prototype.bind;
             var originalTeardown = typeof settings === "object" && settings.teardown
                 ? target.prototype[settings.teardown]
                 : target.prototype.unbind;
+            // only override if prototype callback is a function
+            if (typeof originalCreated === "function" || originalCreated === undefined) {
+                target.prototype.created = function created(_, view) {
+                    // here we relies on the fact that the class Store
+                    // has not been registered somewhere in one of child containers, instead of root container
+                    // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                    // typically like invoking from global Container.instance
+                    $store = view.container.get(Store);
+                    if (originalCreated !== undefined) {
+                        return originalCreated.call(this, _, view);
+                    }
+                };
+            }
             target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
                 var _this = this;
                 if (typeof settings == "object" &&

diff --git a/dist/aurelia-store.d.ts b/dist/aurelia-store.d.ts
@@ -1,4 +1,4 @@
-import { FrameworkConfiguration } from 'aurelia-framework';
+import { Container } from 'aurelia-dependency-injection';
 import { Logger } from 'aurelia-logging';
 import { Observable } from 'rxjs';
 
@@ -267,6 +267,9 @@ export interface MultipleSelector<T, R = T | any> {
 	[key: string]: ((store: Store<T>) => Observable<R>);
 }
 export declare function connectTo<T, R = any>(settings?: ((store: Store<T>) => Observable<R>) | ConnectToSettings<T, R>): (target: any) => void;
+export interface FrameworkConfiguration {
+	container: Container;
+}
 export interface StorePluginOptions<T> extends StoreOptions {
 	initialState: T;
 }

diff --git a/dist/commonjs/aurelia-store.js b/dist/commonjs/aurelia-store.js
@@ -513,9 +513,16 @@ function connectTo(settings) {
     if (!Object.entries) {
         throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
     }
-    var store = aureliaDependencyInjection.Container.instance.get(Store);
+    var $store;
+    // const store = Container.instance.get(Store) as Store<T>;
     var _settings = __assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
     function getSource(selector) {
+        // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+        // then we have no choice but to get the store instance from global container instance
+        // otherwise, assume that $store variable in the closure would be already assigned the right
+        // value from created callback
+        // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+        var store = $store || ($store = aureliaDependencyInjection.Container.instance.get(Store));
         var source = selector(store);
         if (source instanceof rxjs.Observable) {
             return source;
@@ -545,12 +552,26 @@ function connectTo(settings) {
         });
     }
     return function (target) {
+        var originalCreated = target.prototype.created;
         var originalSetup = typeof settings === "object" && settings.setup
             ? target.prototype[settings.setup]
             : target.prototype.bind;
         var originalTeardown = typeof settings === "object" && settings.teardown
             ? target.prototype[settings.teardown]
             : target.prototype.unbind;
+        // only override if prototype callback is a function
+        if (typeof originalCreated === "function" || originalCreated === undefined) {
+            target.prototype.created = function created(_, view) {
+                // here we relies on the fact that the class Store
+                // has not been registered somewhere in one of child containers, instead of root container
+                // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                // typically like invoking from global Container.instance
+                $store = view.container.get(Store);
+                if (originalCreated !== undefined) {
+                    return originalCreated.call(this, _, view);
+                }
+            };
+        }
         target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
             var _this = this;
             if (typeof settings == "object" &&

diff --git a/dist/es2015/aurelia-store.js b/dist/es2015/aurelia-store.js
@@ -385,9 +385,16 @@ function connectTo(settings) {
     if (!Object.entries) {
         throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
     }
-    const store = Container.instance.get(Store);
+    let $store;
+    // const store = Container.instance.get(Store) as Store<T>;
     const _settings = Object.assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
     function getSource(selector) {
+        // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+        // then we have no choice but to get the store instance from global container instance
+        // otherwise, assume that $store variable in the closure would be already assigned the right
+        // value from created callback
+        // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+        const store = $store || ($store = Container.instance.get(Store));
         const source = selector(store);
         if (source instanceof Observable) {
             return source;
@@ -412,12 +419,26 @@ function connectTo(settings) {
         }));
     }
     return function (target) {
+        const originalCreated = target.prototype.created;
         const originalSetup = typeof settings === "object" && settings.setup
             ? target.prototype[settings.setup]
             : target.prototype.bind;
         const originalTeardown = typeof settings === "object" && settings.teardown
             ? target.prototype[settings.teardown]
             : target.prototype.unbind;
+        // only override if prototype callback is a function
+        if (typeof originalCreated === "function" || originalCreated === undefined) {
+            target.prototype.created = function created(_, view) {
+                // here we relies on the fact that the class Store
+                // has not been registered somewhere in one of child containers, instead of root container
+                // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                // typically like invoking from global Container.instance
+                $store = view.container.get(Store);
+                if (originalCreated !== undefined) {
+                    return originalCreated.call(this, _, view);
+                }
+            };
+        }
         target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
             if (typeof settings == "object" &&
                 typeof settings.onChanged === "string" &&

diff --git a/dist/es2017/aurelia-store.js b/dist/es2017/aurelia-store.js
@@ -355,9 +355,16 @@ function connectTo(settings) {
     if (!Object.entries) {
         throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
     }
-    const store = Container.instance.get(Store);
+    let $store;
+    // const store = Container.instance.get(Store) as Store<T>;
     const _settings = Object.assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
     function getSource(selector) {
+        // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+        // then we have no choice but to get the store instance from global container instance
+        // otherwise, assume that $store variable in the closure would be already assigned the right
+        // value from created callback
+        // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+        const store = $store || ($store = Container.instance.get(Store));
         const source = selector(store);
         if (source instanceof Observable) {
             return source;
@@ -382,12 +389,26 @@ function connectTo(settings) {
         }));
     }
     return function (target) {
+        const originalCreated = target.prototype.created;
         const originalSetup = typeof settings === "object" && settings.setup
             ? target.prototype[settings.setup]
             : target.prototype.bind;
         const originalTeardown = typeof settings === "object" && settings.teardown
             ? target.prototype[settings.teardown]
             : target.prototype.unbind;
+        // only override if prototype callback is a function
+        if (typeof originalCreated === "function" || originalCreated === undefined) {
+            target.prototype.created = function created(_, view) {
+                // here we relies on the fact that the class Store
+                // has not been registered somewhere in one of child containers, instead of root container
+                // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                // typically like invoking from global Container.instance
+                $store = view.container.get(Store);
+                if (originalCreated !== undefined) {
+                    return originalCreated.call(this, _, view);
+                }
+            };
+        }
         target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
             if (typeof settings == "object" &&
                 typeof settings.onChanged === "string" &&

diff --git a/dist/native-modules/aurelia-store.js b/dist/native-modules/aurelia-store.js
@@ -512,9 +512,16 @@ function connectTo(settings) {
     if (!Object.entries) {
         throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
     }
-    var store = Container.instance.get(Store);
+    var $store;
+    // const store = Container.instance.get(Store) as Store<T>;
     var _settings = __assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
     function getSource(selector) {
+        // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+        // then we have no choice but to get the store instance from global container instance
+        // otherwise, assume that $store variable in the closure would be already assigned the right
+        // value from created callback
+        // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+        var store = $store || ($store = Container.instance.get(Store));
         var source = selector(store);
         if (source instanceof Observable) {
             return source;
@@ -544,12 +551,26 @@ function connectTo(settings) {
         });
     }
     return function (target) {
+        var originalCreated = target.prototype.created;
         var originalSetup = typeof settings === "object" && settings.setup
             ? target.prototype[settings.setup]
             : target.prototype.bind;
         var originalTeardown = typeof settings === "object" && settings.teardown
             ? target.prototype[settings.teardown]
             : target.prototype.unbind;
+        // only override if prototype callback is a function
+        if (typeof originalCreated === "function" || originalCreated === undefined) {
+            target.prototype.created = function created(_, view) {
+                // here we relies on the fact that the class Store
+                // has not been registered somewhere in one of child containers, instead of root container
+                // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                // typically like invoking from global Container.instance
+                $store = view.container.get(Store);
+                if (originalCreated !== undefined) {
+                    return originalCreated.call(this, _, view);
+                }
+            };
+        }
         target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
             var _this = this;
             if (typeof settings == "object" &&

diff --git a/dist/umd/aurelia-store.js b/dist/umd/aurelia-store.js
@@ -382,9 +382,16 @@
         if (!Object.entries) {
             throw new Error("You need a polyfill for Object.entries for browsers like Internet Explorer. Example: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill");
         }
-        const store = aureliaDependencyInjection.Container.instance.get(Store);
+        let $store;
+        // const store = Container.instance.get(Store) as Store<T>;
         const _settings = Object.assign({ selector: typeof settings === "function" ? settings : defaultSelector }, settings);
         function getSource(selector) {
+            // if for some reason getSource is invoked before setup (bind lifecycle, typically)
+            // then we have no choice but to get the store instance from global container instance
+            // otherwise, assume that $store variable in the closure would be already assigned the right
+            // value from created callback
+            // Could also be in situation where it doesn't come from custom element, or some exotic setups/scenarios
+            const store = $store || ($store = aureliaDependencyInjection.Container.instance.get(Store));
             const source = selector(store);
             if (source instanceof rxjs.Observable) {
                 return source;
@@ -409,12 +416,26 @@
             }));
         }
         return function (target) {
+            const originalCreated = target.prototype.created;
             const originalSetup = typeof settings === "object" && settings.setup
                 ? target.prototype[settings.setup]
                 : target.prototype.bind;
             const originalTeardown = typeof settings === "object" && settings.teardown
                 ? target.prototype[settings.teardown]
                 : target.prototype.unbind;
+            // only override if prototype callback is a function
+            if (typeof originalCreated === "function" || originalCreated === undefined) {
+                target.prototype.created = function created(_, view) {
+                    // here we relies on the fact that the class Store
+                    // has not been registered somewhere in one of child containers, instead of root container
+                    // if there is any issue with this approach, needs to walk all the way up to resolve from root
+                    // typically like invoking from global Container.instance
+                    $store = view.container.get(Store);
+                    if (originalCreated !== undefined) {
+                        return originalCreated.call(this, _, view);
+                    }
+                };
+            }
             target.prototype[typeof settings === "object" && settings.setup ? settings.setup : "bind"] = function () {
                 if (typeof settings == "object" &&
                     typeof settings.onChanged === "string" &&

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,8 @@
+<a name="1.3.3"></a>
+## [1.3.3](https://github.com/aurelia/store/compare/1.3.2...1.3.3) (2019-02-14)
+
+
+
 <a name="1.3.2"></a>
 ## [1.3.2](https://github.com/aurelia/store/compare/1.3.1...1.3.2) (2019-01-19)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-store",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Aurelia single state store based on RxJS",
   "keywords": [
     "aurelia",