Release 2.1.0-beta.10

- Fix: #142
- Fix: #143
- Fix: #144
- Fix: #145

Author: Jonathan Casarrubias

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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-beta.10
+
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/142
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/143
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/144
+- Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/145
+
 ## Release 2.1.0-beta.9
 
 - Fix: https://github.com/mean-expert-official/loopback-sdk-builder/issues/140

lib/angular2/shared/models/flref.ejs

@@ -12,37 +12,45 @@ export class FireLoopRef<T> {
   private observables: any = {};
 
   constructor(name: string, socket: any, parent: FireLoopRef<any> = null) {
-    this.name   = name;
+    this.name = name;
     this.parent = parent;
     this.socket = socket;
     return this;
   }
 
-  public upsert(data: any): Observable<T> {
+  private operation(event: string, data: any): Observable<T> {
     let id: number = Math.floor(Math.random() * 100800) *
-                     Math.floor(Math.random() * 100700) *
-                     Math.floor(Math.random() * 198500);
-    let request: any = {
-        event: `${this.name}.upsert`,
-        data : {
-          id     : id,
-          data   : data,
-          parent : this.parent && this.parent.instance ? this.parent.instance : null
-        }
-    };
+      Math.floor(Math.random() * 100700) *
+      Math.floor(Math.random() * 198500);
     let subject: Subject<T> = new Subject<T>();
-    this.socket.emit('ME:RT:1://event', request);
+    this.socket.emit(`${this.name}.${event}`, {
+      id: id,
+      data: data,
+      parent: this.parent && this.parent.instance ? this.parent.instance : null
+    });
     this.socket.on(`${this.name}.value.result.${id}`, (res: any) =>
       subject.next(res.error ? Observable.throw(res.error) : res)
     );
     return subject.asObservable();
   }
 
-  public on(event: string, filter: LoopBackFilter = { limit: 100 }): Observable<T | T[]> {
+  public upsert(data: any): Observable<T> {
+    return this.operation('upsert', data);
+  }
+
+  public create(data: any): Observable<T> {
+    return this.operation('create', data);
+  }
+
+  public remove(data: any): Observable<T> {
+    return this.operation('remove', data);
+  }
+
+  public on(event: string, filter: LoopBackFilter = { limit: 100, order: 'id DESC' }): Observable<T | T[]> {
     event = `${this.name}.${event}`;
     if (this.observables[event]) { return this.observables[event]; }
     let subject: Subject<T> = new Subject<T>();
-    if (event.match(/(value)/)) {
+    if (event.match(/(value|changes)/)) {
       this.pull(event, filter, subject);
     }
     // Listen for broadcast announces

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mean-expert/loopback-sdk-builder",
-  "version": "2.1.0-beta.8",
+  "version": "2.1.0-beta.10",
   "description": "Tool for auto-generating Software Development Kits (SDKs) for LoopBack",
   "bin": {
     "lb-sdk": "bin/lb-sdk"

tests/angular2/loopback/component-config.json

@@ -3,7 +3,7 @@
     "mountPath": "/explorer"
   },
   "@mean-expert/loopback-component-realtime": {
-    "debug": false,
+    "debug": true,
     "auth": false
   }
 }

tests/angular2/src/app/app.component.ts

@@ -23,12 +23,12 @@ export class AppComponent {
   ) {
     this.logger.info('LoopBack SDK Builder - Test Application');
     // Simple IO Test
-    this.realTime.IO.emit('hello', 'world');
-    this.realTime.IO.on('hello').subscribe((msg: any) => this.logger.info('REALTIME: ', msg));
+    //this.realTime.IO.emit('hello', 'world');
+    //this.realTime.IO.on('hello').subscribe((msg: any) => this.logger.info('REALTIME: ', msg));
     // Simple FireLoop set and get examples.
     let RoomReference: FireLoopRef<Room> = this.realTime.FireLoop.ref<Room>(Room);
     // This will get the list of results and fire every time there is new data.
-    RoomReference.on('value', { limit: 2 }).subscribe((rooms: Array<Room>) => this.logger.info(rooms));
+    RoomReference.on('changes').subscribe((rooms: Array<Room>) => this.logger.info(rooms));
     RoomReference.on('child_added', {
       limit: 2,
       order: 'id DESC'
@@ -43,11 +43,11 @@ export class AppComponent {
       new Room({ name: 'Room 2' }),
       new Room({ name: 'Room 3' }),
       new Room({ name: 'Room 4' })
-    ].forEach((room: Room) => RoomReference.upsert(room).subscribe((instance: Room) => {
-      console.log('ROOM IS CREATED');
+    ].forEach((room: Room) => RoomReference.create(room).subscribe((instance: Room) => {
+
       // Child Feature
      let MessageReference: FireLoopRef<Message> = RoomReference.make(instance).child<Message>('messages');
-      MessageReference.on('child_created').subscribe(
+      MessageReference.on('changes').subscribe(
         (messages: Array<Message>) => this.logger.info(messages)
       );
       MessageReference.upsert({  text : 'Hello Child Reference' }).subscribe((res: Message) => console.log(res.text));

tests/angular2/src/app/shared/sdk/models/FireLoopRef.ts

@@ -12,37 +12,45 @@ export class FireLoopRef<T> {
   private observables: any = {};
 
   constructor(name: string, socket: any, parent: FireLoopRef<any> = null) {
-    this.name   = name;
+    this.name = name;
     this.parent = parent;
     this.socket = socket;
     return this;
   }
 
-  public upsert(data: any): Observable<T> {
+  private operation(event: string, data: any): Observable<T> {
     let id: number = Math.floor(Math.random() * 100800) *
-                     Math.floor(Math.random() * 100700) *
-                     Math.floor(Math.random() * 198500);
-    let request: any = {
-        event: `${this.name}.upsert`,
-        data : {
-          id     : id,
-          data   : data,
-          parent : this.parent && this.parent.instance ? this.parent.instance : null
-        }
-    };
+      Math.floor(Math.random() * 100700) *
+      Math.floor(Math.random() * 198500);
     let subject: Subject<T> = new Subject<T>();
-    this.socket.emit('ME:RT:1://event', request);
+    this.socket.emit(`${this.name}.${event}`, {
+      id: id,
+      data: data,
+      parent: this.parent && this.parent.instance ? this.parent.instance : null
+    });
     this.socket.on(`${this.name}.value.result.${id}`, (res: any) =>
       subject.next(res.error ? Observable.throw(res.error) : res)
     );
     return subject.asObservable();
   }
 
-  public on(event: string, filter: LoopBackFilter = { limit: 100 }): Observable<T | T[]> {
+  public upsert(data: any): Observable<T> {
+    return this.operation('upsert', data);
+  }
+
+  public create(data: any): Observable<T> {
+    return this.operation('create', data);
+  }
+
+  public remove(data: any): Observable<T> {
+    return this.operation('remove', data);
+  }
+
+  public on(event: string, filter: LoopBackFilter = { limit: 100, order: 'id DESC' }): Observable<T | T[]> {
     event = `${this.name}.${event}`;
     if (this.observables[event]) { return this.observables[event]; }
     let subject: Subject<T> = new Subject<T>();
-    if (event.match(/(value)/)) {
+    if (event.match(/(value|changes)/)) {
       this.pull(event, filter, subject);
     }
     // Listen for broadcast announces