1.0.11

dist/smartchok.classes.smartchok.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="q" />
 import * as plugins from './smartchok.plugins';
 import { Stringmap } from 'lik';
 export declare type TSmartchokStatus = 'idle' | 'starting' | 'watching';
@@ -28,12 +27,12 @@ export declare class Smartchok {
     /**
      * gets an observable for a certain event
      */
-    getObservableFor(fsEvent: TFsEvent): plugins.q.Promise<plugins.rx.Observable<any>>;
+    getObservableFor(fsEvent: TFsEvent): Promise<plugins.rx.Observable<any>>;
     /**
      * starts the watcher
      * @returns Promise<void>
      */
-    start(): plugins.q.Promise<void>;
+    start(): Promise<void>;
     /**
      * stop the watcher process if watching
      */

dist/smartchok.classes.smartchok.js

@@ -12,7 +12,7 @@ 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.watchingDeferred = plugins.smartq.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;
@@ -33,7 +33,7 @@ class Smartchok {
      * gets an observable for a certain event
      */
     getObservableFor(fsEvent) {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         this.watchingDeferred.promise.then(() => {
             let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent);
             done.resolve(eventObservable);
@@ -45,7 +45,7 @@ class Smartchok {
      * @returns Promise<void>
      */
     start() {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         this.status = 'starting';
         this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions);
         this.watcher.on('ready', () => {
@@ -72,4 +72,4 @@ class Smartchok {
     }
 }
 exports.Smartchok = Smartchok;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQUsvQjs7R0FFRztBQUNIO0lBUUU7O09BRUc7SUFDSCxZQUFhLGFBQXVCLEVBQUUsYUFBNEMsRUFBRTtRQVZwRixtQkFBYyxHQUFHLElBQUksZUFBUyxFQUFFLENBQUE7UUFFaEMsV0FBTSxHQUFxQixNQUFNLENBQUE7UUFFekIscUJBQWdCLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQVEsQ0FBQSxDQUFDLGlEQUFpRDtRQUM1Rix1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLENBQUEsQ0FBQyxvQ0FBb0M7UUFNL0YsSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDakQsSUFBSSxDQUFDLGVBQWUsR0FBRyxVQUFVLENBQUE7SUFDbkMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsR0FBRyxDQUFDLFlBQXNCO1FBQ3hCLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ2xELENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBRSxPQUFlO1FBQ3JCLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNILGdCQUFnQixDQUFFLE9BQWlCO1FBQ2pDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUE4QixDQUFBO1FBQ3hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ2pDLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ2pHLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUE7UUFDbEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUNqRyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7WUFDeEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFBO1lBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNoQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLFlBQVksR0FBRztZQUNqQixJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RCLENBQUMsQ0FBQTtRQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDckMsWUFBWSxFQUFFLENBQUE7UUFDaEIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxZQUFZLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzlELENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUF4RUQsOEJBd0VDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRjaG9rLmNsYXNzZXMuc21hcnRjaG9rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQUsvQjs7R0FFRztBQUNIO0lBUUU7O09BRUc7SUFDSCxZQUFhLGFBQXVCLEVBQUUsYUFBNEMsRUFBRTtRQVZwRixtQkFBYyxHQUFHLElBQUksZUFBUyxFQUFFLENBQUE7UUFFaEMsV0FBTSxHQUFxQixNQUFNLENBQUE7UUFFekIscUJBQWdCLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQVEsQ0FBQSxDQUFDLGlEQUFpRDtRQUNqRyx1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLENBQUEsQ0FBQyxvQ0FBb0M7UUFNL0YsSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDakQsSUFBSSxDQUFDLGVBQWUsR0FBRyxVQUFVLENBQUE7SUFDbkMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsR0FBRyxDQUFDLFlBQXNCO1FBQ3hCLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ2xELENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBRSxPQUFlO1FBQ3JCLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNILGdCQUFnQixDQUFFLE9BQWlCO1FBQ2pDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUE4QixDQUFBO1FBQzdELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ2pDLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQ2pHLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFRLENBQUE7UUFDdkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUNqRyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUE7WUFDeEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFBO1lBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNoQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLFlBQVksR0FBRztZQUNqQixJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RCLENBQUMsQ0FBQTtRQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDckMsWUFBWSxFQUFFLENBQUE7UUFDaEIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxZQUFZLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzlELENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUF4RUQsOEJBd0VDIn0=

dist/smartchok.plugins.d.ts

@@ -2,7 +2,7 @@ import 'typings-global';
 export import lik = require('lik');
 export import chokidar = require('chokidar');
 export import path = require('path');
-export import q = require('q');
+export import smartq = require('smartq');
 export import rx = require('rxjs/Rx');
 import { Operator } from 'rxjs/Operator';
 import { Observable } from 'rxjs/Observable';

dist/smartchok.plugins.js

@@ -4,6 +4,6 @@ require("typings-global");
 exports.lik = require("lik");
 exports.chokidar = require("chokidar");
 exports.path = require("path");
-exports.q = require("q");
+exports.smartq = require("smartq");
 exports.rx = require("rxjs/Rx");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGNob2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qiw2QkFBa0M7QUFDbEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyx5QkFBOEI7QUFDOUIsZ0NBQXFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjaG9rLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGNob2sucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qiw2QkFBa0M7QUFDbEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyxtQ0FBd0M7QUFDeEMsZ0NBQXFDIn0=

package.json

@@ -1,11 +1,11 @@
 {
   "name": "smartchok",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "smart wrapper for chokidar",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npm run prepareTest && npmts)",
+    "test": "(yarn run prepareTest && npmts)",
     "prepareTest": "(rm -f ./test/assets/hi.txt)"
   },
   "repository": {
@@ -20,10 +20,8 @@
   "homepage": "https://gitlab.com/pushrocks/smartchok#README",
   "dependencies": {
     "@types/chokidar": "^1.7.0",
-    "@types/q": "x.x.x",
     "chokidar": "^1.7.0",
     "lik": "^1.0.32",
-    "q": "^1.5.0",
     "rxjs": "^5.4.1",
     "smartipc": "^1.0.9",
     "smartq": "^1.1.1",

test/test.ts

@@ -1,10 +1,10 @@
 import { tap, expect } from 'tapbundle'
+import * as smartchok from '../dist/index'
 import * as smartfile from 'smartfile'
 import * as smartq from 'smartq'
 import * as rx from 'rxjs/Rx'
 
 // the module to test
-import * as smartchok from '../dist/index'
 
 let testSmartchok: smartchok.Smartchok
 let testAddObservable: rx.Observable<any>

ts/smartchok.classes.smartchok.ts

@@ -12,7 +12,7 @@ export class Smartchok {
   chokidarOptions: plugins.chokidar.WatchOptions
   status: TSmartchokStatus = 'idle'
   private watcher
-  private watchingDeferred = plugins.q.defer<void>() // used to run things when watcher is initialized
+  private watchingDeferred = plugins.smartq.defer<void>() // used to run things when watcher is initialized
   private eventObservablemap = new plugins.lik.Observablemap() // register one observable per event
 
   /**
@@ -40,8 +40,8 @@ export class Smartchok {
   /**
    * 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>>()
+  getObservableFor (fsEvent: TFsEvent): Promise<plugins.rx.Observable<any>> {
+    let done = plugins.smartq.defer<plugins.rx.Observable<any>>()
     this.watchingDeferred.promise.then(() => {
       let eventObservable = this.eventObservablemap.getObservableForEmitterEvent(this.watcher, fsEvent)
       done.resolve(eventObservable)
@@ -53,8 +53,8 @@ export class Smartchok {
    * starts the watcher
    * @returns Promise<void>
    */
-  start(): plugins.q.Promise<void> {
-    let done = plugins.q.defer<void>()
+  start(): Promise<void> {
+    let done = plugins.smartq.defer<void>()
     this.status = 'starting'
     this.watcher = plugins.chokidar.watch(this.watchStringmap.getStringArray(), this.chokidarOptions)
     this.watcher.on('ready', () => {

ts/smartchok.plugins.ts

@@ -2,14 +2,14 @@ import 'typings-global'
 export import lik = require('lik')
 export import chokidar = require('chokidar')
 export import path = require('path')
-export import q = require('q')
+export import smartq = require('smartq')
 export import rx = require('rxjs/Rx')
 
 // workaround
-import {Operator} from 'rxjs/Operator';
-import {Observable} from 'rxjs/Observable';
+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>;
+    lift<R>(operator: Operator<T, R>): Observable<R>
   }
 }

yarn.lock

@@ -35,7 +35,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/lodash@^4.14.50", "@types/lodash@^4.14.55", "@types/lodash@^4.14.62":
+"@types/lodash@^4.14.50", "@types/lodash@^4.14.55", "@types/lodash@^4.14.67":
   version "4.14.67"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.67.tgz#4714714434da110306b9862fbd36b30b55eb850a"
 
@@ -51,7 +51,7 @@
   version "0.0.27"
   resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780"
 
-"@types/q@1.x.x", "@types/q@x.x.x":
+"@types/q@1.x.x":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.0.1.tgz#dbccb01bd8f0f801a12a4604c7d7af59bb02ae2f"
 
@@ -803,19 +803,18 @@ left-pad@^1.1.3:
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"
 
 lik@^1.0.32:
-  version "1.0.32"
-  resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.32.tgz#41ee6c8edd483eaa11bd089775263955f5555060"
+  version "1.0.36"
+  resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.36.tgz#28eb171e5cae4b5d619de34af1911a2990d378aa"
   dependencies:
-    "@types/lodash" "^4.14.62"
+    "@types/lodash" "^4.14.67"
     "@types/minimatch" "2.x.x"
     "@types/q" "1.x.x"
     lodash "^4.17.4"
-    minimatch "^3.0.3"
+    minimatch "^3.0.4"
     q "^1.5.0"
-    rxjs "^5.3.0"
+    rxjs "^5.4.1"
     smartq "^1.1.1"
-    tapbundle "^1.0.14"
-    typings-global "^1.0.14"
+    typings-global "^1.0.19"
 
 lodash@^4.17.4:
   version "4.17.4"
@@ -873,7 +872,7 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -1165,7 +1164,7 @@ rimraf@2, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
-rxjs@^5.3.0, rxjs@^5.4.1:
+rxjs@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.1.tgz#b62f757f279445d265a18a58fb0a70dc90e91626"
   dependencies: