From 6d22ee466ff8712adfcaa031b099816a6995b037 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sat, 23 Jul 2016 04:39:42 +0200 Subject: [PATCH] now checking correctly if Stringmap is empty --- dist/lik.plugins.d.ts | 1 + dist/lik.plugins.js | 3 +- dist/lik.stringmap.d.ts | 22 +++++++++++++- dist/lik.stringmap.js | 59 ++++++++++++++++++++++++++++++++++---- package.json | 2 ++ test/test.js | 8 +++++- test/test.ts | 9 ++++++ ts/lik.plugins.ts | 3 +- ts/lik.stringmap.ts | 63 +++++++++++++++++++++++++++++++++++++++-- 9 files changed, 158 insertions(+), 12 deletions(-) diff --git a/dist/lik.plugins.d.ts b/dist/lik.plugins.d.ts index cf0fd4f..54a21c3 100644 --- a/dist/lik.plugins.d.ts +++ b/dist/lik.plugins.d.ts @@ -1,2 +1,3 @@ import "typings-global"; export import q = require("q"); +export import minimatch = require("minimatch"); diff --git a/dist/lik.plugins.js b/dist/lik.plugins.js index 0d2318c..2ca6339 100644 --- a/dist/lik.plugins.js +++ b/dist/lik.plugins.js @@ -1,4 +1,5 @@ "use strict"; require("typings-global"); exports.q = require("q"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9saWsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsU0FBQyxXQUFXLEdBQUcsQ0FBQyxDQUFDIn0= \ No newline at end of file +exports.minimatch = require("minimatch"); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9saWsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsU0FBQyxXQUFXLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMifQ== \ No newline at end of file diff --git a/dist/lik.stringmap.d.ts b/dist/lik.stringmap.d.ts index 281abee..04d54d5 100644 --- a/dist/lik.stringmap.d.ts +++ b/dist/lik.stringmap.d.ts @@ -1,8 +1,12 @@ /** * allows you to easily keep track of a bunch of strings; */ +export interface triggerFunction { + (): boolean; +} export declare class Stringmap { private _stringArray; + private _triggerUntilTrueFunctionArray; constructor(); /** * add a string to the Stringmap @@ -12,6 +16,10 @@ export declare class Stringmap { * removes a string from Stringmap */ removeString(stringArg: string): void; + /** + * wipes the Stringmap + */ + wipe(): void; /** * check if string is in Stringmap */ @@ -19,5 +27,17 @@ export declare class Stringmap { /** * checks stringPresence with minimatch */ - checkMinimatch(stringArg: string): void; + checkMinimatch(miniMatchStringArg: string): boolean; + /** + * checks if the Stringmap is empty + */ + checkIsEmpty(): boolean; + /** + * notifies triggers + */ + private notifyTrigger(); + /** + * register a new trigger + */ + registerUntilTrue(functionArg: triggerFunction, doFunctionArg: any): void; } diff --git a/dist/lik.stringmap.js b/dist/lik.stringmap.js index f8cf6fc..10f4816 100644 --- a/dist/lik.stringmap.js +++ b/dist/lik.stringmap.js @@ -1,10 +1,9 @@ "use strict"; -/** - * allows you to easily keep track of a bunch of strings; - */ +const plugins = require("./lik.plugins"); class Stringmap { constructor() { this._stringArray = []; + this._triggerUntilTrueFunctionArray = []; } ; /** @@ -12,6 +11,7 @@ class Stringmap { */ addString(stringArg) { this._stringArray.push(stringArg); + this.notifyTrigger(); } ; /** @@ -24,6 +24,15 @@ class Stringmap { } ; } + ; + this.notifyTrigger(); + } + /** + * wipes the Stringmap + */ + wipe() { + this._stringArray = []; + this.notifyTrigger(); } /** * check if string is in Stringmap @@ -34,8 +43,48 @@ class Stringmap { /** * checks stringPresence with minimatch */ - checkMinimatch(stringArg) { + checkMinimatch(miniMatchStringArg) { + let foundMatch = false; + for (let stringItem of this._stringArray) { + if (plugins.minimatch(stringItem, miniMatchStringArg)) { + foundMatch = true; + } + ; + } + ; + return foundMatch; + } + ; + /** + * checks if the Stringmap is empty + */ + checkIsEmpty() { + return (this._stringArray.length == 0); + } + // trigger registering + /** + * notifies triggers + */ + notifyTrigger() { + let filteredArray = this._triggerUntilTrueFunctionArray.filter((functionArg) => { + return !functionArg(); + }); + this._triggerUntilTrueFunctionArray = filteredArray; + } + ; + /** + * register a new trigger + */ + registerUntilTrue(functionArg, doFunctionArg) { + this._triggerUntilTrueFunctionArray.push(() => { + let result = functionArg(); + if (result == true) { + doFunctionArg(); + } + return result; + }); + this.notifyTrigger(); } } exports.Stringmap = Stringmap; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlrLnN0cmluZ21hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2xpay5zdHJpbmdtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBOztHQUVHO0FBQ0g7SUFFSTtRQURRLGlCQUFZLEdBQVksRUFBRSxDQUFDO0lBR25DLENBQUM7O0lBQ0Q7O09BRUc7SUFDSCxTQUFTLENBQUMsU0FBZ0I7UUFDdEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDdEMsQ0FBQzs7SUFFRDs7T0FFRztJQUNILFlBQVksQ0FBQyxTQUFnQjtRQUN6QixHQUFHLENBQUMsQ0FBQyxJQUFJLE1BQU0sSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUEsQ0FBQztZQUNsQyxFQUFFLENBQUEsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLFNBQVMsQ0FBQyxDQUFBLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBQyxDQUFDLENBQUMsQ0FBQztZQUNqRCxDQUFDO1lBQUEsQ0FBQztRQUNOLENBQUM7SUFDTCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxXQUFXLENBQUMsU0FBZ0I7UUFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRDs7T0FFRztJQUNILGNBQWMsQ0FBQyxTQUFnQjtJQUUvQixDQUFDO0FBQ0wsQ0FBQztBQXBDWSxpQkFBUyxZQW9DckIsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlrLnN0cmluZ21hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2xpay5zdHJpbmdtYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLGVBQWUsQ0FBQyxDQUFBO0FBVXpDO0lBR0k7UUFGUSxpQkFBWSxHQUFZLEVBQUUsQ0FBQztRQUMzQixtQ0FBOEIsR0FBcUIsRUFBRSxDQUFDO0lBRzlELENBQUM7O0lBQ0Q7O09BRUc7SUFDSCxTQUFTLENBQUMsU0FBZ0I7UUFDdEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQ3pCLENBQUM7O0lBRUQ7O09BRUc7SUFDSCxZQUFZLENBQUMsU0FBZ0I7UUFDekIsR0FBRyxDQUFDLENBQUMsSUFBSSxNQUFNLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBLENBQUM7WUFDbEMsRUFBRSxDQUFBLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxTQUFTLENBQUMsQ0FBQSxDQUFDO2dCQUN2QyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakQsQ0FBQztZQUFBLENBQUM7UUFDTixDQUFDO1FBQUEsQ0FBQztRQUNGLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJO1FBQ0EsSUFBSSxDQUFDLFlBQVksR0FBRyxFQUFFLENBQUM7UUFDdkIsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFRDs7T0FFRztJQUNILFdBQVcsQ0FBQyxTQUFnQjtRQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsY0FBYyxDQUFDLGtCQUF5QjtRQUNwQyxJQUFJLFVBQVUsR0FBVyxLQUFLLENBQUM7UUFDL0IsR0FBRyxDQUFBLENBQUMsSUFBSSxVQUFVLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBLENBQUM7WUFDckMsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLEVBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFBLENBQUM7Z0JBQ2pELFVBQVUsR0FBRyxJQUFJLENBQUM7WUFDdEIsQ0FBQztZQUFBLENBQUM7UUFDTixDQUFDO1FBQUEsQ0FBQztRQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUM7SUFDdEIsQ0FBQzs7SUFFRDs7T0FFRztJQUNILFlBQVk7UUFDUixNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsc0JBQXNCO0lBRXRCOztPQUVHO0lBQ0ssYUFBYTtRQUNqQixJQUFJLGFBQWEsR0FBRyxJQUFJLENBQUMsOEJBQThCLENBQUMsTUFBTSxDQUFDLENBQUMsV0FBVztZQUN2RSxNQUFNLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUMxQixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyw4QkFBOEIsR0FBRyxhQUFhLENBQUM7SUFDeEQsQ0FBQzs7SUFFRDs7T0FFRztJQUNILGlCQUFpQixDQUFDLFdBQTJCLEVBQUMsYUFBYTtRQUN2RCxJQUFJLENBQUMsOEJBQThCLENBQUMsSUFBSSxDQUNwQztZQUNJLElBQUksTUFBTSxHQUFHLFdBQVcsRUFBRSxDQUFDO1lBQzNCLEVBQUUsQ0FBQSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsQ0FBQSxDQUFDO2dCQUNmLGFBQWEsRUFBRSxDQUFDO1lBQ3BCLENBQUM7WUFDRCxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQ2xCLENBQUMsQ0FDSixDQUFDO1FBQ0YsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQ3pCLENBQUM7QUFDTCxDQUFDO0FBeEZZLGlCQUFTLFlBd0ZyQixDQUFBIn0= \ No newline at end of file diff --git a/package.json b/package.json index 6e16b6e..f81a16c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,9 @@ "typings-test": "^1.0.1" }, "dependencies": { + "@types/minimatch": "^2.0.28", "@types/q": "^0.0.27", + "minimatch": "^3.0.2", "q": "^1.4.1" } } diff --git a/test/test.js b/test/test.js index ba04686..d2910c7 100644 --- a/test/test.js +++ b/test/test.js @@ -27,6 +27,12 @@ describe("lik", function () { testStringmap.removeString(testString2); testStringmap.checkString(testString2).should.be.false(); }); + it("should register a function to trigger when empty", function () { + testStringmap.registerUntilTrue(() => { return testStringmap.checkIsEmpty(); }, () => { console.log("Stringmap now is empty"); }); + }); + it("should remove wipe and then notify", function () { + testStringmap.wipe(); + }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsTUFBTyxHQUFHLFdBQVcsZUFBZSxDQUFDLENBQUM7QUFDdEMsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixRQUFRLENBQUMsS0FBSyxFQUFDO0lBQ1gsUUFBUSxDQUFDLFdBQVcsRUFBQztRQUNqQixJQUFJLGFBQTJCLENBQUM7UUFDaEMsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDO1FBQ2hDLElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQztRQUNoQyxJQUFJLFdBQVcsR0FBRyxhQUFhLENBQUM7UUFDaEMsRUFBRSxDQUFDLHdDQUF3QyxFQUFDO1lBQ3hDLGFBQWEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNwQyxhQUFhLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3RELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLG9EQUFvRCxFQUFDO1lBQ3BELGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3RCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxtQ0FBbUMsRUFBQztZQUNuQyxhQUFhLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ3JDLGFBQWEsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDckMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNyQyxhQUFhLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEQsYUFBYSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hELGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM1RCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx1Q0FBdUMsRUFBQztZQUN2QyxhQUFhLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ3hDLGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3RCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsTUFBTyxHQUFHLFdBQVcsZUFBZSxDQUFDLENBQUM7QUFDdEMsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixRQUFRLENBQUMsS0FBSyxFQUFDO0lBQ1gsUUFBUSxDQUFDLFdBQVcsRUFBQztRQUNqQixJQUFJLGFBQTJCLENBQUM7UUFDaEMsSUFBSSxXQUFXLEdBQUcsYUFBYSxDQUFDO1FBQ2hDLElBQUksV0FBVyxHQUFHLGFBQWEsQ0FBQztRQUNoQyxJQUFJLFdBQVcsR0FBRyxhQUFhLENBQUM7UUFDaEMsRUFBRSxDQUFDLHdDQUF3QyxFQUFDO1lBQ3hDLGFBQWEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNwQyxhQUFhLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3RELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLG9EQUFvRCxFQUFDO1lBQ3BELGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3RCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxtQ0FBbUMsRUFBQztZQUNuQyxhQUFhLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ3JDLGFBQWEsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDckMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNyQyxhQUFhLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEQsYUFBYSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hELGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM1RCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyx1Q0FBdUMsRUFBQztZQUN2QyxhQUFhLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ3hDLGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3RCxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxrREFBa0QsRUFBQztZQUNsRCxhQUFhLENBQUMsaUJBQWlCLENBQzNCLFFBQU8sTUFBTSxDQUFDLGFBQWEsQ0FBQyxZQUFZLEVBQUUsQ0FBQSxDQUFBLENBQUMsRUFDM0MsUUFBTyxPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUEsQ0FBQSxDQUFDLENBQ2hELENBQUM7UUFDTixDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxvQ0FBb0MsRUFBQztZQUNwQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDekIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIn0= \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 7e06dd6..f740478 100644 --- a/test/test.ts +++ b/test/test.ts @@ -27,5 +27,14 @@ describe("lik",function(){ testStringmap.removeString(testString2); testStringmap.checkString(testString2).should.be.false(); }); + it("should register a function to trigger when empty",function(){ + testStringmap.registerUntilTrue( + () => {return testStringmap.checkIsEmpty()}, + () => {console.log("Stringmap now is empty")} + ); + }); + it("should remove wipe and then notify",function(){ + testStringmap.wipe(); + }) }) }); \ No newline at end of file diff --git a/ts/lik.plugins.ts b/ts/lik.plugins.ts index f96859a..75f568e 100644 --- a/ts/lik.plugins.ts +++ b/ts/lik.plugins.ts @@ -1,2 +1,3 @@ import "typings-global"; -export import q = require("q"); \ No newline at end of file +export import q = require("q"); +export import minimatch = require("minimatch"); \ No newline at end of file diff --git a/ts/lik.stringmap.ts b/ts/lik.stringmap.ts index 4d8066e..e221165 100644 --- a/ts/lik.stringmap.ts +++ b/ts/lik.stringmap.ts @@ -3,8 +3,14 @@ import * as plugins from "./lik.plugins"; /** * allows you to easily keep track of a bunch of strings; */ + +export interface triggerFunction { + ():boolean; +} + export class Stringmap { private _stringArray:string[] = []; + private _triggerUntilTrueFunctionArray:triggerFunction[] = []; constructor(){ }; @@ -13,6 +19,7 @@ export class Stringmap { */ addString(stringArg:string){ this._stringArray.push(stringArg); + this.notifyTrigger(); }; /** @@ -23,20 +30,70 @@ export class Stringmap { if(this._stringArray[keyArg] == stringArg){ this._stringArray.splice(parseInt(keyArg),1); }; - } + }; + this.notifyTrigger(); + } + + /** + * wipes the Stringmap + */ + wipe(){ + this._stringArray = []; + this.notifyTrigger(); } /** * check if string is in Stringmap */ - checkString(stringArg:string):boolean{ + checkString(stringArg:string):boolean { return this._stringArray.indexOf(stringArg) != -1; } /** * checks stringPresence with minimatch */ - checkMinimatch(stringArg:string){ + checkMinimatch(miniMatchStringArg:string):boolean { + let foundMatch:boolean = false; + for(let stringItem of this._stringArray){ + if(plugins.minimatch(stringItem,miniMatchStringArg)){ + foundMatch = true; + }; + }; + return foundMatch; + }; + /** + * checks if the Stringmap is empty + */ + checkIsEmpty(){ + return (this._stringArray.length == 0); + } + + // trigger registering + + /** + * notifies triggers + */ + private notifyTrigger(){ + let filteredArray = this._triggerUntilTrueFunctionArray.filter((functionArg) => { + return !functionArg(); + }); + this._triggerUntilTrueFunctionArray = filteredArray; + }; + + /** + * register a new trigger + */ + registerUntilTrue(functionArg:triggerFunction,doFunctionArg){ + this._triggerUntilTrueFunctionArray.push( + () => { + let result = functionArg(); + if(result == true){ + doFunctionArg(); + } + return result; + } + ); + this.notifyTrigger(); } } \ No newline at end of file