update to wirj like expected

dist/index.d.ts

@@ -1,41 +1 @@
-/// <reference types="q" />
+export * from './smartchok.classes.smartchok';
-import * as plugins from './smartchok.plugins';
-import { Stringmap } from 'lik';
-export declare type TSmartchokStatus = 'idle' | 'starting' | 'watching';
-export declare type TFsEvent = 'add' | 'addDir' | 'change' | 'error' | 'unlink' | 'unlinkDir' | 'ready' | 'raw';
-/**
- * Smartchok allows easy wathcing of files
- */
-export declare class Smartchok {
-    watchStringmap: Stringmap;
-    chokidarOptions: plugins.chokidar.WatchOptions;
-    status: TSmartchokStatus;
-    private watcher;
-    private watchingDeferred;
-    private eventObservablemap;
-    /**
-     * constructor of class smartchok
-     */
-    constructor(watchArrayArg: string[], optionsArg?: plugins.chokidar.WatchOptions);
-    /**
-     * adds files to the list of watched files
-     */
-    add(pathArrayArg: string[]): void;
-    /**
-     * removes files from the list of watched files
-     */
-    remove(pathArg: string): void;
-    /**
-     * gets an observable for a certain event
-     */
-    getObservableFor(fsEvent: TFsEvent): plugins.q.Promise<plugins.rx.Observable<any>>;
-    /**
-     * starts the watcher
-     * @returns Promise<void>
-     */
-    start(): plugins.q.Promise<void>;
-    /**
-     * stop the watcher process if watching
-     */
-    stop(): void;
-}

dist/index.js

@@ -1,83 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+function __export(m) {
-const plugins = require("./smartchok.plugins");
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-const lik_1 = require("lik");
-/**
- * Smartchok allows easy wathcing of files
- */
-class Smartchok {
-    /**
-     * constructor of class smartchok
-     */
-    constructor(watchArrayArg, optionsArg = {}) {
-        this.watchStringmap = new lik_1.Stringmap();
-        this.status = 'idle';
-        this.watchingDeferred = plugins.q.defer(); // used to run things when watcher is initialized
-        this.eventObservablemap = new plugins.lik.Observablemap(); // register one observable per event
-        this.watchStringmap.addStringArray(watchArrayArg);
-        this.chokidarOptions = optionsArg;
-    }
-    /**
-     * adds files to the list of watched files
-     */
-    add(pathArrayArg) {
-        this.watchStringmap.addStringArray(pathArrayArg);
-        if (this.status !== 'idle') {
-            this.watchingDeferred.promise.then(() => {
-                this.watcher.add(pathArrayArg);
-            });
-        }
-    }
-    /**
-     * removes files from the list of watched files
-     */
-    remove(pathArg) {
-        this.watchStringmap.removeString(''); // TODO
-        this.watchingDeferred.promise.then(() => {
-            this.watcher.unwatch(pathArg);
-        });
-    }
-    /**
-     * gets an observable for a certain event
-     */
-    getObservableFor(fsEvent) {
-        let done = plugins.q.defer();
-        this.watchingDeferred.promise.then(() => {
-            let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent);
-            done.resolve(eventObservable);
-        });
-        return done.promise;
-    }
-    /**
-     * starts the watcher
-     * @returns Promise<void>
-     */
-    start() {
-        let done = plugins.q.defer();
-        this.status = 'starting';
-        this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions);
-        this.watcher.on('ready', () => {
-            this.status = 'watching';
-            this.watchingDeferred.resolve();
-            done.resolve();
-        });
-        return done.promise;
-    }
-    /**
-     * stop the watcher process if watching
-     */
-    stop() {
-        let closeWatcher = () => {
-            this.watcher.close();
-        };
-        if (this.status === 'watching') {
-            console.log('closing while watching');
-            closeWatcher();
-        }
-        else if (this.status === 'starting') {
-            this.watchingDeferred.promise.then(() => { closeWatcher(); });
-        }
-    }
 }
-exports.Smartchok = Smartchok;
+Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtDQUE4QztBQUM5Qyw2QkFBK0I7QUFLL0I7O0dBRUc7QUFDSDtJQVFFOztPQUVHO0lBQ0gsWUFBWSxhQUF1QixFQUFFLGFBQTRDLEVBQUU7UUFWbkYsbUJBQWMsR0FBRyxJQUFJLGVBQVMsRUFBRSxDQUFBO1FBRWhDLFdBQU0sR0FBcUIsTUFBTSxDQUFBO1FBRXpCLHFCQUFnQixHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUEsQ0FBQyxpREFBaUQ7UUFDNUYsdUJBQWtCLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFBLENBQUMsb0NBQW9DO1FBTS9GLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQ2pELElBQUksQ0FBQyxlQUFlLEdBQUcsVUFBVSxDQUFBO0lBQ25DLENBQUM7SUFFRDs7T0FFRztJQUNILEdBQUcsQ0FBQyxZQUFzQjtRQUN4QixJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUNoRCxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDM0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7Z0JBQ2pDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFBO1lBQ2hDLENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQztJQUVILENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBQyxPQUFlO1FBQ3BCLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsT0FBTztRQUM1QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNqQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUMvQixDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNILGdCQUFnQixDQUFDLE9BQWlCO1FBQ2hDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUE4QixDQUFBO1FBQ3hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ2pDLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ2pHLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUE7UUFDbEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUNqRyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7WUFDeEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFBO1lBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNoQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLFlBQVksR0FBRztZQUNqQixJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RCLENBQUMsQ0FBQTtRQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDckMsWUFBWSxFQUFFLENBQUE7UUFDaEIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxZQUFZLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzlELENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUFqRkQsOEJBaUZDIn0=
+__export(require("./smartchok.classes.smartchok"));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE2QyJ9

dist/smartchok.child.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLmNoaWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRjaG9rLmNoaWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

dist/smartchok.classes.smartchok.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="q" />
+import * as plugins from './smartchok.plugins';
+import { Stringmap } from 'lik';
+export declare type TSmartchokStatus = 'idle' | 'starting' | 'watching';
+export declare type TFsEvent = 'add' | 'addDir' | 'change' | 'error' | 'unlink' | 'unlinkDir' | 'ready' | 'raw';
+/**
+ * Smartchok allows easy wathcing of files
+ */
+export declare class Smartchok {
+    watchStringmap: Stringmap;
+    chokidarOptions: plugins.chokidar.WatchOptions;
+    status: TSmartchokStatus;
+    private watcher;
+    private watchingDeferred;
+    private eventObservablemap;
+    /**
+     * constructor of class smartchok
+     */
+    constructor(watchArrayArg: string[], optionsArg?: plugins.chokidar.WatchOptions);
+    /**
+     * adds files to the list of watched files
+     */
+    add(pathArrayArg: string[]): void;
+    /**
+     * removes files from the list of watched files
+     */
+    remove(pathArg: string): void;
+    /**
+     * gets an observable for a certain event
+     */
+    getObservableFor(fsEvent: TFsEvent): plugins.q.Promise<plugins.rx.Observable<any>>;
+    /**
+     * starts the watcher
+     * @returns Promise<void>
+     */
+    start(): plugins.q.Promise<void>;
+    /**
+     * stop the watcher process if watching
+     */
+    stop(): void;
+}

dist/smartchok.classes.smartchok.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./smartchok.plugins");
+const lik_1 = require("lik");
+/**
+ * Smartchok allows easy wathcing of files
+ */
+class Smartchok {
+    /**
+     * constructor of class smartchok
+     */
+    constructor(watchArrayArg, optionsArg = {}) {
+        this.watchStringmap = new lik_1.Stringmap();
+        this.status = 'idle';
+        this.watchingDeferred = plugins.q.defer(); // used to run things when watcher is initialized
+        this.eventObservablemap = new plugins.lik.Observablemap(); // register one observable per event
+        this.watchStringmap.addStringArray(watchArrayArg);
+        this.chokidarOptions = optionsArg;
+    }
+    /**
+     * adds files to the list of watched files
+     */
+    add(pathArrayArg) {
+        this.watchStringmap.addStringArray(pathArrayArg);
+    }
+    /**
+     * removes files from the list of watched files
+     */
+    remove(pathArg) {
+        this.watchStringmap.removeString(pathArg);
+    }
+    /**
+     * gets an observable for a certain event
+     */
+    getObservableFor(fsEvent) {
+        let done = plugins.q.defer();
+        this.watchingDeferred.promise.then(() => {
+            let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent);
+            done.resolve(eventObservable);
+        });
+        return done.promise;
+    }
+    /**
+     * starts the watcher
+     * @returns Promise<void>
+     */
+    start() {
+        let done = plugins.q.defer();
+        this.status = 'starting';
+        this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions);
+        this.watcher.on('ready', () => {
+            this.status = 'watching';
+            this.watchingDeferred.resolve();
+            done.resolve();
+        });
+        return done.promise;
+    }
+    /**
+     * stop the watcher process if watching
+     */
+    stop() {
+        let closeWatcher = () => {
+            this.watcher.close();
+        };
+        if (this.status === 'watching') {
+            console.log('closing while watching');
+            closeWatcher();
+        }
+        else if (this.status === 'starting') {
+            this.watchingDeferred.promise.then(() => { closeWatcher(); });
+        }
+    }
+}
+exports.Smartchok = Smartchok;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQUsvQjs7R0FFRztBQUNIO0lBUUU7O09BRUc7SUFDSCxZQUFhLGFBQXVCLEVBQUUsYUFBNEMsRUFBRTtRQVZwRixtQkFBYyxHQUFHLElBQUksZUFBUyxFQUFFLENBQUE7UUFFaEMsV0FBTSxHQUFxQixNQUFNLENBQUE7UUFFekIscUJBQWdCLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQVEsQ0FBQSxDQUFDLGlEQUFpRDtRQUM1Rix1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLENBQUEsQ0FBQyxvQ0FBb0M7UUFNL0YsSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDakQsSUFBSSxDQUFDLGVBQWUsR0FBRyxVQUFVLENBQUE7SUFDbkMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsR0FBRyxDQUFDLFlBQXNCO1FBQ3hCLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ2xELENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBRSxPQUFlO1FBQ3JCLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNILGdCQUFnQixDQUFFLE9BQWlCO1FBQ2pDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUE4QixDQUFBO1FBQ3hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ2pDLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ2pHLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUE7UUFDbEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUNqRyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7WUFDeEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFBO1lBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNoQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLFlBQVksR0FBRztZQUNqQixJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RCLENBQUMsQ0FBQTtRQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDckMsWUFBWSxFQUFFLENBQUE7UUFDaEIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxZQUFZLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzlELENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUF4RUQsOEJBd0VDIn0=

dist/smartchok.classes.watcher.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLmNsYXNzZXMud2F0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Y2hvay5jbGFzc2VzLndhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

dist/smartchok.plugins.d.ts

@@ -1,6 +1,13 @@
 import 'typings-global';
-export import chokidar = require('chokidar');
 export import lik = require('lik');
+export import chokidar = require('chokidar');
 export import path = require('path');
 export import q = require('q');
 export import rx = require('rxjs/Rx');
+import { Operator } from 'rxjs/Operator';
+import { Observable } from 'rxjs/Observable';
+declare module 'rxjs/Subject' {
+    interface Subject<T> {
+        lift<R>(operator: Operator<T, R>): Observable<R>;
+    }
+}

dist/smartchok.plugins.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
-exports.chokidar = require("chokidar");
 exports.lik = require("lik");
+exports.chokidar = require("chokidar");
 exports.path = require("path");
 exports.q = require("q");
 exports.rx = require("rxjs/Rx");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGNob2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qix1Q0FBNEM7QUFDNUMsNkJBQWtDO0FBQ2xDLCtCQUFvQztBQUNwQyx5QkFBOEI7QUFDOUIsZ0NBQXFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGNob2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qiw2QkFBa0M7QUFDbEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyx5QkFBOEI7QUFDOUIsZ0NBQXFDIn0=

package.json

@@ -19,17 +19,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartchok#README",
   "dependencies": {
-    "@types/chokidar": "^1.6.0",
+    "@types/chokidar": "^1.7.0",
     "@types/q": "x.x.x",
-    "chokidar": "^1.6.1",
+    "chokidar": "^1.7.0",
-    "lik": "^1.0.30",
+    "lik": "^1.0.32",
     "q": "^1.5.0",
-    "rxjs": "^5.3.0",
+    "rxjs": "^5.4.1",
     "smartipc": "^1.0.9",
-    "typings-global": "^1.0.14"
+    "smartq": "^1.1.1",
+    "typings-global": "^1.0.19"
   },
   "devDependencies": {
-    "smartfile": "^4.1.9",
+    "smartfile": "^4.2.17",
-    "tapbundle": "^1.0.5"
+    "tapbundle": "^1.0.14"
   }
 }

test/test.js

@@ -1,38 +0,0 @@
-"use strict";
-require("typings-test");
-const should = require("should");
-const smartfile = require("smartfile");
-const smartchok = require("../dist/index");
-describe('smartchok', function () {
-    let testSmartchok;
-    let testAddObservable;
-    let testSubscription;
-    it('should create a new instance', function () {
-        testSmartchok = new smartchok.Smartchok([]);
-        should(testSmartchok).be.instanceof(smartchok.Smartchok);
-    });
-    it('should add some files to watch and start', function (done) {
-        testSmartchok.add(['./test/assets/**/*.txt']);
-        testSmartchok.start().then(() => {
-            testSmartchok.add(['./test/assets/**/*.md']);
-            done();
-        }).catch(err => { console.log(err); });
-    });
-    it('should get an observable for a certain event', function (done) {
-        testSmartchok.getObservableFor('add').then((observableArg) => {
-            testAddObservable = observableArg;
-            done();
-        }).catch(err => { console.log(err); });
-    });
-    it('should register an add operation', function (done) {
-        this.timeout(5000);
-        testSubscription = testAddObservable.subscribe(x => {
-            done();
-        });
-        smartfile.memory.toFs('HI', './test/assets/hi.txt');
-    });
-    it('should stop the watch process', function () {
-        testSmartchok.stop();
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsdUNBQXNDO0FBRXRDLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFDO0lBQ2pCLElBQUksYUFBa0MsQ0FBQTtJQUN0QyxJQUFJLGlCQUFxQyxDQUFBO0lBQ3pDLElBQUksZ0JBQWlDLENBQUE7SUFDckMsRUFBRSxDQUFDLDhCQUE4QixFQUFDO1FBQzlCLGFBQWEsR0FBRyxJQUFJLFNBQVMsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDM0MsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQzVELENBQUMsQ0FBQyxDQUFBO0lBQ0YsRUFBRSxDQUFDLDBDQUEwQyxFQUFDLFVBQVMsSUFBSTtRQUN2RCxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFBO1FBQzdDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdkIsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLENBQUMsQ0FBQTtZQUM1QyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pDLENBQUMsQ0FBQyxDQUFBO0lBQ0YsRUFBRSxDQUFDLDhDQUE4QyxFQUFDLFVBQVMsSUFBSTtRQUMzRCxhQUFhLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsYUFBYTtZQUNyRCxpQkFBaUIsR0FBRyxhQUFhLENBQUE7WUFDakMsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyxrQ0FBa0MsRUFBQyxVQUFTLElBQUk7UUFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNsQixnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1QyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO1FBQ0YsU0FBUyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFDLHNCQUFzQixDQUFDLENBQUE7SUFDdEQsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsK0JBQStCLEVBQUM7UUFDL0IsYUFBYSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==

test/test.ts

@@ -41,3 +41,5 @@ tap.test('should register an add operation', async () => {
 tap.test('should stop the watch process', async () => {
   testSmartchok.stop()
 }).catch(tap.threw)
+
+tap.start()

ts/index.ts

@@ -1,91 +1 @@
-import * as plugins from './smartchok.plugins'
+export * from './smartchok.classes.smartchok'
-import { Stringmap } from 'lik'
-
-export type TSmartchokStatus = 'idle' | 'starting' | 'watching'
-export type TFsEvent = 'add' | 'addDir' | 'change' | 'error' | 'unlink' | 'unlinkDir' | 'ready' | 'raw'
-
-/**
- * Smartchok allows easy wathcing of files
- */
-export class Smartchok {
-  watchStringmap = new Stringmap()
-  chokidarOptions: plugins.chokidar.WatchOptions
-  status: TSmartchokStatus = 'idle'
-  private watcher
-  private watchingDeferred = plugins.q.defer<void>() // used to run things when watcher is initialized
-  private eventObservablemap = new plugins.lik.Observablemap() // register one observable per event
-
-  /**
-   * constructor of class smartchok
-   */
-  constructor(watchArrayArg: string[], optionsArg: plugins.chokidar.WatchOptions = {}) {
-    this.watchStringmap.addStringArray(watchArrayArg)
-    this.chokidarOptions = optionsArg
-  }
-
-  /**
-   * adds files to the list of watched files
-   */
-  add(pathArrayArg: string[]) {
-    this.watchStringmap.addStringArray(pathArrayArg)
-    if (this.status !== 'idle') {
-      this.watchingDeferred.promise.then(() => {
-        this.watcher.add(pathArrayArg)
-      })
-    }
-
-  }
-
-  /**
-   * removes files from the list of watched files
-   */
-  remove(pathArg: string) {
-    this.watchStringmap.removeString('') // TODO
-    this.watchingDeferred.promise.then(() => {
-      this.watcher.unwatch(pathArg)
-    })
-  }
-
-  /**
-   * gets an observable for a certain event
-   */
-  getObservableFor(fsEvent: TFsEvent): plugins.q.Promise<plugins.rx.Observable<any>> {
-    let done = plugins.q.defer<plugins.rx.Observable<any>>()
-    this.watchingDeferred.promise.then(() => {
-      let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent)
-      done.resolve(eventObservable)
-    })
-    return done.promise
-  }
-
-  /**
-   * starts the watcher
-   * @returns Promise<void>
-   */
-  start(): plugins.q.Promise<void> {
-    let done = plugins.q.defer<void>()
-    this.status = 'starting'
-    this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions)
-    this.watcher.on('ready', () => {
-      this.status = 'watching'
-      this.watchingDeferred.resolve()
-      done.resolve()
-    })
-    return done.promise
-  }
-
-  /**
-   * stop the watcher process if watching
-   */
-  stop() {
-    let closeWatcher = () => {
-      this.watcher.close()
-    }
-    if (this.status === 'watching') {
-      console.log('closing while watching')
-      closeWatcher()
-    } else if (this.status === 'starting') {
-      this.watchingDeferred.promise.then(() => { closeWatcher() })
-    }
-  }
-}

ts/smartchok.child.ts

@@ -0,0 +1 @@
+import chokidar = require('chokidar')

ts/smartchok.classes.smartchok.ts

@@ -0,0 +1,82 @@
+import * as plugins from './smartchok.plugins'
+import { Stringmap } from 'lik'
+
+export type TSmartchokStatus = 'idle' | 'starting' | 'watching'
+export type TFsEvent = 'add' | 'addDir' | 'change' | 'error' | 'unlink' | 'unlinkDir' | 'ready' | 'raw'
+
+/**
+ * Smartchok allows easy wathcing of files
+ */
+export class Smartchok {
+  watchStringmap = new Stringmap()
+  chokidarOptions: plugins.chokidar.WatchOptions
+  status: TSmartchokStatus = 'idle'
+  private watcher
+  private watchingDeferred = plugins.q.defer<void>() // used to run things when watcher is initialized
+  private eventObservablemap = new plugins.lik.Observablemap() // register one observable per event
+
+  /**
+   * constructor of class smartchok
+   */
+  constructor (watchArrayArg: string[], optionsArg: plugins.chokidar.WatchOptions = {}) {
+    this.watchStringmap.addStringArray(watchArrayArg)
+    this.chokidarOptions = optionsArg
+  }
+
+  /**
+   * adds files to the list of watched files
+   */
+  add(pathArrayArg: string[]) {
+    this.watchStringmap.addStringArray(pathArrayArg)
+  }
+
+  /**
+   * removes files from the list of watched files
+   */
+  remove (pathArg: string) {
+    this.watchStringmap.removeString(pathArg)
+  }
+
+  /**
+   * gets an observable for a certain event
+   */
+  getObservableFor (fsEvent: TFsEvent): plugins.q.Promise<plugins.rx.Observable<any>> {
+    let done = plugins.q.defer<plugins.rx.Observable<any>>()
+    this.watchingDeferred.promise.then(() => {
+      let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent)
+      done.resolve(eventObservable)
+    })
+    return done.promise
+  }
+
+  /**
+   * starts the watcher
+   * @returns Promise<void>
+   */
+  start(): plugins.q.Promise<void> {
+    let done = plugins.q.defer<void>()
+    this.status = 'starting'
+    this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions)
+    this.watcher.on('ready', () => {
+      this.status = 'watching'
+      this.watchingDeferred.resolve()
+      done.resolve()
+    })
+    return done.promise
+  }
+
+  /**
+   * stop the watcher process if watching
+   */
+  stop() {
+    let closeWatcher = () => {
+      this.watcher.close()
+    }
+    if (this.status === 'watching') {
+      console.log('closing while watching')
+      closeWatcher()
+    } else if (this.status === 'starting') {
+      this.watchingDeferred.promise.then(() => { closeWatcher() })
+    }
+  }
+}

ts/smartchok.classes.watcher.ts

@@ -0,0 +1,2 @@
+import * as plugins from './smartchok.plugins'
+

ts/smartchok.plugins.ts

@@ -1,6 +1,15 @@
 import 'typings-global'
-export import chokidar = require('chokidar')
 export import lik = require('lik')
+export import chokidar = require('chokidar')
 export import path = require('path')
 export import q = require('q')
 export import rx = require('rxjs/Rx')
+
+// workaround
+import {Operator} from 'rxjs/Operator';
+import {Observable} from 'rxjs/Observable';
+declare module 'rxjs/Subject' {
+  interface Subject<T> {
+    lift<R>(operator: Operator<T, R>): Observable<R>;
+  }
+}