Merge pull request #275 from mean-expert-official/development

Release 2.1.0-rc.7

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 This file is created to keep history of the LoopBack SDK Builder, it does not consider or keeps any history of its parent module `loopback-sdk-angular`.
 
+## Release 2.1.0-rc.7
+
+- Milestone Details: https://github.com/mean-expert-official/loopback-sdk-builder/milestone/29?closed=1
+
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/274
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/273
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/272
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/271
+
 ## Release 2.1.0-rc.6
 
 - Milestone Details: https://github.com/mean-expert-official/loopback-sdk-builder/milestone/28?closed=1
@@ -11,6 +20,7 @@ This file is created to keep history of the LoopBack SDK Builder, it does not co
 - Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/265
 - Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/264
 - Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/262
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/260
 - Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/151
 
 ## Release 2.1.0-rc.5

lib/angular2/shared/models/flref.ejs

@@ -181,7 +181,7 @@ export class FireLoopRef<T> {
       (res: T) =>
         this.socket.emit(`${event}.broadcast.request.${ this.id }`, request)
     );
-    this.socket.onZone(`${ event }.broadcast.${ this.id }`, (data) => sbj.next(data));
+    this.socket.onZone(`${ event }.broadcast.${ this.id }`, (data: any) => sbj.next(data));
     return sbj.asObservable();
   }
   /**

lib/angular2/shared/services/core/realtime.ejs

@@ -42,7 +42,7 @@ export class RealTime {
   public onReady(): Observable<null> {
     let subject: Subject<null> = new Subject<null>();
     if (this.connected) {
-      subject.next();
+      setTimeout(() => subject.next());
     } else {
       this.socket   = this.getConnection();
       this.IO       = new IO(this.socket);

lib/angular2/shared/sockets/connections.ts

@@ -35,7 +35,7 @@ export class SocketConnections {
           this.setupConnection(url, token, config);
       });
       let forceConfig: any = setInterval(() => {
-        if (!this.configured && this.connections[url].connected) {
+        if (!this.configured && this.connections[url] && this.connections[url].connected) {
           console.info('Forcing IO Configuration');
           this.setupConnection(url, token, config);
           clearInterval(forceConfig);
@@ -51,9 +51,12 @@ export class SocketConnections {
 
   public disconnect() {
     Object.keys(this.connections).forEach((connKey) => {
-      if (this.connections[connKey].connected) {
+      if (this.connections[connKey] && this.connections[connKey].connected) {
         this.connections[connKey].disconnect();
       }
+      if (this.connections[connKey].off) {
+        this.connections[connKey].off();
+      }
     });
     this.connections = {};
     this.configured  = false;

lib/angular2/shared/sockets/socket.native.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
-var SocketIO = require('nativescript-socket.io');
+import * as SocketIO from 'nativescript-socket.io';
 export class SocketNative {
-  connect(url: any, options: any) {
+  connect(url: any, options: any): SocketIO.Socket {
     return SocketIO.connect(url, options);
   }
 }

lib/angular2/shared/storage/storage.browser.ts

@@ -26,9 +26,9 @@ export class StorageBrowser {
       console.log('Trying to remove unexisting key: ', key);
     }
   }
-  private isJSON(str) {
+  private isJSON(data: string) {
     try {
-      JSON.parse(str);
+      JSON.parse(data);
     } catch (e) {
       return false;
     }

lib/angular2/shared/storage/storage.native.ts

@@ -21,9 +21,9 @@ export class StorageNative {
       console.log('Trying to remove unexisting key: ', key);
     }
   }
-  private isJSON(str) {
+  private isJSON(data: string) {
     try {
-      JSON.parse(str);
+      JSON.parse(data);
     } catch (e) {
       return false;
     }

lib/angular2/shared/storage/storage.swaps.ts

@@ -6,7 +6,7 @@
  * The InternalStorage class is used for dependency injection swapping.
  * It will be provided using factory method from different sources.
  **/
-class Storage {
+export class Storage {
   get(key: string): any {}
   set(key: string, value: any): any {}
   remove(key: string): any {}

package.json

@@ -1,17 +1,17 @@
 {
   "name": "@mean-expert/loopback-sdk-builder",
-  "version": "2.1.0-rc.6",
+  "version": "2.1.0-rc.7",
   "description": "Tool for auto-generating Software Development Kits (SDKs) for LoopBack",
   "bin": {
     "lb-sdk": "bin/lb-sdk"
   },
   "main": "index.js",
   "scripts": {
     "prepublish": "",
-    "test": "npm run load:api & npm run test:angular2",
-    "pretest": "cd tests/angular2 && npm install && npm install ../../ && npm run build:sdk",
-    "load:api": "cd tests/angular2 && NODE_ENV=testing node loopback/server",
-    "test:angular2": "cd tests/angular2 && npm test"
+    "test": "npm run load:api & npm run test:ng2web",
+    "pretest": "cd tests/fireloop && npm install && npm install ../../ && npm run build:sdk",
+    "load:api": "cd tests/fireloop && NODE_ENV=ci node server/server",
+    "test:ng2web": "cd tests/ng2web && npm test"
   },
   "repository": {
     "type": "git",

tests/.yo-rc.json

@@ -0,0 +1,11 @@
+{
+  "generator-fireloop": {
+    "version": "1.0.0-alpha.38",
+    "clients": {
+      "ng2web": {
+        "path": "./ng2web",
+        "type": "ng2web"
+      }
+    }
+  }
+}