prepub

Author: robwormald

.vscode/settings.json

@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}

package.json

@@ -2,21 +2,23 @@
   "name": "@ngrx/db",
   "version": "1.0.0",
   "description": "RxJS + IndexedDB for Angular2",
-  "main": "dist/database.js",
+  "main": "index.js",
   "scripts": {
     "test": "karma start --ci",
+    "prepare": "npm run clean && npm run build && npm run copy_package",
+    "copy_package": "cp -r package.json dist/package.json",
     "watch": "karma start",
-    "build": "npm run build_test",
+    "build": "tsc",
     "build_test": "tsc -p ./spec",
     "clean": "rm -rf dist",
     "clean_example": "rm -rf example_dist",
     "example": "npm run clean_example && tsc -p ./example && http-server"
   },
   "author": "Rob Wormald <[email protected]>",
   "license": "MIT",
-  "dependencies": {
-    "angular2": "^2.0.0-beta.0",
-    "rxjs": "^5.0.0-beta.0"
+  "peerDependencies": {
+    "angular2": "^2.0.0-beta.14",
+    "rxjs": "^5.0.0-beta.2"
   },
   "devDependencies": {
     "es6-promise": "^3.0.2",

spec/tsconfig.json

@@ -8,7 +8,8 @@
 		"outDir": "../tmp",
 		"declaration": true
 	},
-	"exclude": [
-    "node_modules"
+	"files": [
+    "../typings/browser.d.ts",
+    "db_spec.ts"
   ]
-}
+}

src/database.ts

@@ -1,8 +1,11 @@
-import 'rxjs/Rx';
 import {Observable} from 'rxjs/Observable';
 import {Subscriber} from 'rxjs/Subscriber';
 import {Subject} from 'rxjs/Subject';
 import {OpaqueToken, Inject, provide} from 'angular2/core';
+import 'rxjs/add/operator/mergeMap'
+import 'rxjs/add/operator/do'
+import 'rxjs/add/operator/toArray'
+import 'rxjs/add/observable/fromArray'
 
 const IDB_SUCCESS = 'success';
 const IDB_COMPLETE = 'complete';
@@ -35,17 +38,17 @@ export interface DBSchema {
 export const getIDBFactory = () => window.indexedDB || self.indexedDB;
 
 export class Database {
-  
+
   public changes:Subject<any> = new Subject();
-  
+
   private _idb:IDBFactory;
   private _schema: DBSchema;
 
   constructor(@Inject(DatabaseBackend) idbBackend, @Inject(IDB_SCHEMA) schema){
     this._schema = schema;
     this._idb = idbBackend;
   }
-  
+
   private _upgradeDB(observer, db:IDBDatabase){
     for(var storeName in this._schema.stores){
       if(db.objectStoreNames.contains(storeName)){
@@ -56,17 +59,17 @@ export class Database {
     observer.next(db);
     observer.complete();
   }
-  
+
   private _createObjectStore(db:IDBDatabase, key:string, schema:DBStore){
     let objectStore = db.createObjectStore(key, {autoIncrement: true});
   }
-  
+
   open(dbName:string, version:number = 1, upgradeHandler?:DBUpgradeHandler):Observable<IDBDatabase> {
     const idb = this._idb;
-    return new Observable((observer:Subscriber<any>) => {
-      
+    return Observable.create((observer:Subscriber<any>) => {
+
       const openReq = idb.open(dbName, this._schema.version);
-      
+
       const onSuccess = (event) => {
         observer.next(event.target.result);
         observer.complete();
@@ -75,90 +78,90 @@ export class Database {
         console.log(err);
         observer.error(err);
       }
-      
+
       const onUpgradeNeeded = (event) => {
         this._upgradeDB(observer, event.target.result);
       }
-      
+
       openReq.addEventListener(IDB_SUCCESS, onSuccess);
       openReq.addEventListener(IDB_ERROR, onError);
       openReq.addEventListener(IDB_UPGRADE_NEEDED, onUpgradeNeeded);
-      
+
       return () => {
         openReq.removeEventListener(IDB_SUCCESS, onSuccess);
         openReq.removeEventListener(IDB_ERROR, onError);
         openReq.removeEventListener(IDB_UPGRADE_NEEDED, onUpgradeNeeded);
       }
-    
+
     });
   }
-  
+
   deleteDatabase(dbName:string){
     return new Observable((deletionObserver:Subscriber<any>) => {
-      
+
       const deleteRequest = this._idb.deleteDatabase(dbName);
-      
+
       const onSuccess = (event) => {
         deletionObserver.next(null);
         deletionObserver.complete();
       }
-      
+
       const onError = (err) => deletionObserver.error(err);
-      
+
       deleteRequest.addEventListener(IDB_SUCCESS, onSuccess);
       deleteRequest.addEventListener(IDB_ERROR, onError);
-      
+
       return () => {
         deleteRequest.removeEventListener(IDB_SUCCESS, onSuccess);
         deleteRequest.removeEventListener(IDB_ERROR, onError);
       }
     })
   }
-  
+
   insert(storeName:string, records:any[], notify:boolean = true){
     return this.executeWrite(storeName, 'add', records)
       .do(payload => notify ? this.changes.next({type: DB_INSERT, payload }) : ({}));
   }
-  
+
   get(storeName:string, key:any){
     return this.open(this._schema.name)
       .mergeMap(db => {
         return new Observable(txnObserver => {
          const txn = db.transaction([storeName], IDB_TXN_READ);
          const objectStore = txn.objectStore(storeName);
-         
+
          const getRequest = objectStore.get(key);
-         
+
          const onTxnError = (err) => txnObserver.error(err);
          const onTxnComplete = () => txnObserver.complete();
          const onRecordFound = (ev) => txnObserver.next(getRequest.result);
-          
+
          txn.addEventListener(IDB_COMPLETE, onTxnComplete);
          txn.addEventListener(IDB_ERROR, onTxnError);
-         
+
          getRequest.addEventListener(IDB_SUCCESS, onRecordFound);
          getRequest.addEventListener(IDB_ERROR, onTxnError);
-         
+
          return () => {
            getRequest.removeEventListener(IDB_SUCCESS, onRecordFound);
            getRequest.removeEventListener(IDB_ERROR, onTxnError);
            txn.removeEventListener(IDB_COMPLETE, onTxnComplete);
            txn.removeEventListener(IDB_ERROR, onTxnError);
          }
-         
+
         });
       });
   }
-  
+
   query(storeName:string, predicate?:(rec:any) => boolean){
     return this.open(this._schema.name)
       .mergeMap(db => {
         return new Observable(txnObserver => {
          const txn = db.transaction([storeName], IDB_TXN_READ);
          const objectStore = txn.objectStore(storeName);
-         
+
          const getRequest = objectStore.openCursor();
-         
+
          const onTxnError = (err) => txnObserver.error(err);
          const onRecordFound = (ev) => {
            let cursor = ev.target.result;
@@ -178,36 +181,36 @@ export class Database {
              txnObserver.complete();
            }
          }
-          
+
          txn.addEventListener(IDB_ERROR, onTxnError);
-         
+
          getRequest.addEventListener(IDB_SUCCESS, onRecordFound);
          getRequest.addEventListener(IDB_ERROR, onTxnError);
-         
+
          return () => {
            getRequest.removeEventListener(IDB_SUCCESS, onRecordFound);
            getRequest.removeEventListener(IDB_ERROR, onTxnError);
            txn.removeEventListener(IDB_ERROR, onTxnError);
          }
-         
+
         });
       });
   }
-  
+
   executeWrite(storeName:string, actionType:string, records:any[]){
     const changes = this.changes;
     return this.open(this._schema.name)
       .mergeMap(db => {
         return new Observable(txnObserver => {
           const txn = db.transaction([storeName], IDB_TXN_READWRITE);
           const objectStore = txn.objectStore(storeName);
-          
+
           const onTxnError = (err) => txnObserver.error(err);
           const onTxnComplete = () => txnObserver.complete();
-          
+
           txn.addEventListener(IDB_COMPLETE, onTxnComplete);
           txn.addEventListener(IDB_ERROR, onTxnError);
-          
+
           const makeRequest = (record) => {
             return new Observable(reqObserver => {
               let req = objectStore[actionType](record);
@@ -220,11 +223,11 @@ export class Database {
               });
             });
           }
-          
-          let requestSubscriber = Observable.from(records)
+
+          let requestSubscriber = Observable.fromArray(records)
             .mergeMap(makeRequest)
             .subscribe(txnObserver);
-          
+
           return () => {
             requestSubscriber.unsubscribe();
             txn.removeEventListener(IDB_COMPLETE, onTxnComplete);
@@ -233,7 +236,7 @@ export class Database {
         });
       });
   }
-  
+
   compare(a:any, b:any):number{
     return this._idb.cmp(a, b);
   }

src/index.ts

@@ -0,0 +1 @@
+export * from './database'

tsconfig.json

@@ -9,7 +9,8 @@
 		"declaration": true
 	},
 	"files": [
-    "src/database.ts",
-    "spec/db_spec.ts"
+    "typings/browser.d.ts",
+    "src/index.ts",
+    "src/database.ts"
 	]
-}
+}

typings.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ngrx/db",
+  "version": false,
+  "dependencies": {}
+}