implab/implabjs-core Commit - r15:d5a3d3ab9fd7

fixed format-compile bug while formatting strings with new line symbols....

cin -

r15:d5a3d3ab9fd7 propose cancellat...

parent child

Context file:

r15:d5a3d3ab9fd7

Collapse all files

test/ts/TestTraits.ts created 644 +39 0

@@ -0,0 +1,39
	1	import { IObservable, ICancellation, IDestroyable } from "@implab/core/interfaces";
	2	import * as TraceEvent from '@implab/core/log/TraceEvent';
	3	import { Cancellation } from "@implab/core/Cancellation";
	4	import * as TraceSource from "@implab/core/log/TraceSource";
	5	import * as tape from 'tape';
	6	import { argumentNotNull } from "@implab/core/safe";
	7
	8	export class TapeWriter implements IDestroyable {
	9	readonly _tape: tape.Test
	10
	11	_subscriptions = new Array<IDestroyable>();
	12
	13	constructor(tape: tape.Test) {
	14	argumentNotNull(tape, "tape");
	15	this._tape = tape;
	16	}
	17
	18	writeEvents(source: IObservable<TraceEvent>, ct: ICancellation = Cancellation.none) {
	19	let subscription = source.on(this.writeEvent.bind(this));
	20	if (ct.isSupported()) {
	21	ct.register(subscription.destroy.bind(subscription));
	22	}
	23	this._subscriptions.push(subscription);
	24	}
	25
	26	writeEvent(next: TraceEvent) {
	27	if (next.level >= TraceSource.LogLevel) {
	28	this._tape.comment("LOG " + next.arg);
	29	} else if(next.level >= TraceSource.WarnLevel) {
	30	this._tape.comment("WARN " + next.arg);
	31	} else {
	32	this._tape.comment("ERROR " + next.arg);
	33	}
	34	}
	35
	36	destroy() {
	37	this._subscriptions.forEach(x => x.destroy());
	38	}
	39	} No newline at end of file

package-lock.json +7 -7

             {
               "name": "@implab/core",
               "version": "0.0.1-dev",
               "lockfileVersion": 1,
               "requires": true,
               "dependencies": {
                 "@types/node": {
                   "version": "10.5.1",
                   "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz",
                   "integrity": "sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==",
                   "dev": true
                 },
                 "@types/tape": {
                   "version": "4.2.32",
                   "resolved": "https://registry.npmjs.org/@types/tape/-/tape-4.2.32.tgz",
                   "integrity": "sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ==",
                   "dev": true,
                   "requires": {
                     "@types/node": "10.5.1"
                   }
                 },
                 "balanced-match": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
                   "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
                   "dev": true
                 },
                 "brace-expansion": {
                   "version": "1.1.11",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
                   "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
                   "dev": true,
                   "requires": {
                     "balanced-match": "1.0.0",
                     "concat-map": "0.0.1"
                   }
                 },
                 "concat-map": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                   "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
                   "dev": true
                 },
                 "core-util-is": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                   "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
                   "dev": true
                 },
                 "deep-equal": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
                   "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
                   "dev": true
                 },
                 "define-properties": {
                   "version": "1.1.2",
                   "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
                   "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
                   "dev": true,
                   "requires": {
                     "foreach": "2.0.5",
                     "object-keys": "1.0.12"
                   }
                 },
                 "defined": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
                   "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
                   "dev": true
                 },
                 "dojo": {
                   "version": "1.13.0",
                   "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.13.0.tgz",
                   "integrity": "sha512-mGoGvsXAbPkUrBnxCoO7m6CFH8jvWq7rAL7fP7jrhJEOyswA/bZwWdXwEH0ovs68t8S0+xOpV/3V7addYbaiAA=="
                 },
                 "duplexer": {
                   "version": "0.1.1",
                   "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                   "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                   "dev": true
                 },
                 "es-abstract": {
                   "version": "1.12.0",
                   "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
                   "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
                   "dev": true,
                   "requires": {
                     "es-to-primitive": "1.1.1",
                     "function-bind": "1.1.1",
                     "has": "1.0.3",
                     "is-callable": "1.1.3",
                     "is-regex": "1.0.4"
                   }
                 },
                 "es-to-primitive": {
                   "version": "1.1.1",
                   "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
                   "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
                   "dev": true,
                   "requires": {
                     "is-callable": "1.1.3",
                     "is-date-object": "1.0.1",
                     "is-symbol": "1.0.1"
                   }
                 },
                 "faucet": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/faucet/-/faucet-0.0.1.tgz",
                   "integrity": "sha1-WX3PHSGJosBiMhtZHo8VHtIDnZw=",
                   "dev": true,
                   "requires": {
                     "defined": "0.0.0",
                     "duplexer": "0.1.1",
                     "minimist": "0.0.5",
                     "sprintf": "0.1.5",
                     "tap-parser": "0.4.3",
                     "tape": "2.3.3",
                     "through2": "0.2.3"
                   },
                   "dependencies": {
                     "deep-equal": {
                       "version": "0.1.2",
                       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz",
                       "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=",
                       "dev": true
                     },
                     "defined": {
                       "version": "0.0.0",
                       "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
                       "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=",
                       "dev": true
                     },
                     "minimist": {
                       "version": "0.0.5",
-                      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
                       "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=",
                       "dev": true
                     },
                     "tape": {
                       "version": "2.3.3",
                       "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                       "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                       "dev": true,
                       "requires": {
                         "deep-equal": "0.1.2",
                         "defined": "0.0.0",
                         "inherits": "2.0.3",
                         "jsonify": "0.0.0",
                         "resumer": "0.0.0",
                         "through": "2.3.8"
                       }
                     }
                   }
                 },
                 "for-each": {
                   "version": "0.3.3",
                   "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
                   "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
                   "dev": true,
                   "requires": {
                     "is-callable": "1.1.3"
                   }
                 },
                 "foreach": {
                   "version": "2.0.5",
                   "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
                   "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
                   "dev": true
                 },
                 "fs.realpath": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
                   "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
                   "dev": true
                 },
                 "function-bind": {
                   "version": "1.1.1",
                   "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
                   "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
                   "dev": true
                 },
                 "glob": {
                   "version": "7.1.2",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
                   "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
                   "dev": true,
                   "requires": {
                     "fs.realpath": "1.0.0",
                     "inflight": "1.0.6",
                     "inherits": "2.0.3",
                     "minimatch": "3.0.4",
                     "once": "1.4.0",
                     "path-is-absolute": "1.0.1"
                   }
                 },
                 "has": {
                   "version": "1.0.3",
                   "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
                   "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
                   "dev": true,
                   "requires": {
                     "function-bind": "1.1.1"
                   }
                 },
                 "inflight": {
                   "version": "1.0.6",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
                   "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
                   "dev": true,
                   "requires": {
                     "once": "1.4.0",
                     "wrappy": "1.0.2"
                   }
                 },
                 "inherits": {
                   "version": "2.0.3",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                   "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
                   "dev": true
                 },
                 "is-callable": {
                   "version": "1.1.3",
                   "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
                   "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
                   "dev": true
                 },
                 "is-date-object": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
                   "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
                   "dev": true
                 },
                 "is-regex": {
                   "version": "1.0.4",
                   "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
                   "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
                   "dev": true,
                   "requires": {
                     "has": "1.0.3"
                   }
                 },
                 "is-symbol": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
                   "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
                   "dev": true
                 },
                 "isarray": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
                   "dev": true
                 },
                 "jsonify": {
                   "version": "0.0.0",
                   "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
                   "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
                   "dev": true
                 },
                 "minimatch": {
                   "version": "3.0.4",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                   "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
                   "dev": true,
                   "requires": {
                     "brace-expansion": "1.1.11"
                   }
                 },
                 "minimist": {
                   "version": "1.2.0",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
                   "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                   "dev": true
                 },
                 "object-inspect": {
                   "version": "1.6.0",
                   "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
                   "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
                   "dev": true
                 },
                 "object-keys": {
                   "version": "1.0.12",
                   "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
                   "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
                   "dev": true
                 },
                 "once": {
                   "version": "1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                   "dev": true,
                   "requires": {
                     "wrappy": "1.0.2"
                   }
                 },
                 "path-is-absolute": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                   "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
                   "dev": true
                 },
                 "path-parse": {
                   "version": "1.0.5",
                   "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
                   "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
                   "dev": true
                 },
                 "readable-stream": {
                   "version": "1.1.14",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                   "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "dev": true,
                   "requires": {
                     "core-util-is": "1.0.2",
                     "inherits": "2.0.3",
                     "isarray": "0.0.1",
                     "string_decoder": "0.10.31"
                   }
                 },
                 "requirejs": {
-                  "version": "2.3.6",
+                  "version": "2.3.5",
-                  "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
+                  "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
-                  "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
+                  "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
                   "dev": true
                 },
                 "resolve": {
                   "version": "1.7.1",
                   "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
                   "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
                   "dev": true,
                   "requires": {
                     "path-parse": "1.0.5"
                   }
                 },
                 "resumer": {
                   "version": "0.0.0",
                   "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
                   "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
                   "dev": true,
                   "requires": {
                     "through": "2.3.8"
                   }
                 },
                 "sprintf": {
                   "version": "0.1.5",
                   "resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz",
                   "integrity": "sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=",
                   "dev": true
                 },
                 "string.prototype.trim": {
                   "version": "1.1.2",
                   "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
                   "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
                   "dev": true,
                   "requires": {
                     "define-properties": "1.1.2",
                     "es-abstract": "1.12.0",
                     "function-bind": "1.1.1"
                   }
                 },
                 "string_decoder": {
                   "version": "0.10.31",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                   "dev": true
                 },
                 "tap-parser": {
                   "version": "0.4.3",
                   "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-0.4.3.tgz",
                   "integrity": "sha1-pOrhkMENdsehEZIf84u+TVjwnuo=",
                   "dev": true,
                   "requires": {
                     "inherits": "2.0.3",
                     "readable-stream": "1.1.14"
                   }
                 },
                 "tape": {
                   "version": "4.9.1",
                   "resolved": "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz",
                   "integrity": "sha512-6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw==",
                   "dev": true,
                   "requires": {
                     "deep-equal": "1.0.1",
                     "defined": "1.0.0",
                     "for-each": "0.3.3",
                     "function-bind": "1.1.1",
                     "glob": "7.1.2",
                     "has": "1.0.3",
                     "inherits": "2.0.3",
                     "minimist": "1.2.0",
                     "object-inspect": "1.6.0",
                     "resolve": "1.7.1",
                     "resumer": "0.0.0",
                     "string.prototype.trim": "1.1.2",
                     "through": "2.3.8"
                   }
                 },
                 "through": {
                   "version": "2.3.8",
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
                   "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
                   "dev": true
                 },
                 "through2": {
                   "version": "0.2.3",
                   "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {
                     "readable-stream": "1.1.14",
                     "xtend": "2.1.2"
                   }
                 },
                 "typescript": {
-                  "version": "3.0.3",
+                  "version": "2.9.2",
-                  "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-                  "integrity": "sha512-kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==",
+                  "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
                   "dev": true
                 },
                 "wrappy": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                   "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
                   "dev": true
                 },
                 "xtend": {
                   "version": "2.1.2",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
                   "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
                   "dev": true,
                   "requires": {
                     "object-keys": "0.4.0"
                   },
                   "dependencies": {
                     "object-keys": {
                       "version": "0.4.0",
                       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
                       "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
                       "dev": true
                     }
                   }
                 }
               }
             }

src/js/text/format-compile.js +2 -2

             define(
                 [],
                 function() {
                     var map = {
                         "\\{" : "&curlopen;",
                         "\\}" : "&curlclose;",
                         "&" : "&amp;",
                         "\\:" : "&colon;"
                     };
                     var rev = {
                         curlopen : "{",
                         curlclose : "}",
                         amp : "&",
                         colon : ":"
                     };
                     var espaceString = function(s) {
                         if (!s)
                             return s;
-                        return "'" + s.replace(/('|\\)/g, "\\$1") + "'";
+                        return "'" + s.replace(/('|\\)/g, "\\$1").replace("\n","\\n") + "'";
                     };
                     var encode = function(s) {
                         if (!s)
                             return s;
-                        return s.replace(/\\{|\\}|&|\\:/g, function(m) {
+                        return s.replace(/\\{|\\}|&|\\:|\n/g, function(m) {
                             return map[m] || m;
                         });
                     };
                     var decode = function(s) {
                         if (!s)
                             return s;
                         return s.replace(/&(\w+);/g, function(m, $1) {
                             return rev[$1] || m;
                         });
                     };
                     var subst = function(s) {
                         var i = s.indexOf(":"), name, pattern;
                         if (i >= 0) {
                             name = s.substr(0, i);
                             pattern = s.substr(i + 1);
                         } else {
                             name = s;
                         }
                         if (pattern)
                             return [
                                 espaceString(decode(name)),
                                 espaceString(decode(pattern)) ];
                         else
                             return [ espaceString(decode(name)) ];
                     };
                     var compile = function(str) {
                         if (!str)
                             return function() {};
                         var chunks = encode(str).split("{"), chunk;
                         var code = [ "var result=[];" ];
                         for (var i = 0; i < chunks.length; i++) {
                             chunk = chunks[i];
                             if (i === 0) {
                                 if (chunk)
                                     code.push("result.push(" + espaceString(decode(chunk)) +
                                         ");");
                             } else {
                                 var len = chunk.indexOf("}");
                                 if (len < 0)
                                     throw new Error("Unbalanced substitution #" + i);
                                 code.push("result.push(subst(" +
                                     subst(chunk.substr(0, len)).join(",") + "));");
                                 if (chunk.length > len + 1)
                                     code.push("result.push(" +
                                         espaceString(decode(chunk.substr(len + 1))) + ");");
                             }
                         }
                         code.push("return result.join('');");
                         /* jshint -W054 */
                         return new Function("subst", code.join("\n"));
                     };
                     var cache = {};
                     return function(template) {
                         var compiled = cache[template];
                         if (!compiled) {
                             compiled = compile(template);
                             cache[template] = compiled;
                         }
                         return compiled;
                     };
                 });

src/ts/components/Observable.ts +149 -28

@@ -1,94 +1,215
1	import { IObservable, IDestroyable, ICancellation } from '../interfaces';	1	import { IObservable, IDestroyable, ICancellation } from '../interfaces';
2	import { Cancellation } from '../Cancellation'	2	import { Cancellation } from '../Cancellation'
3	import { argumentNotNull } from '../safe';	3	import { argumentNotNull } from '../safe';
4		4
5		5
6	interface Handler<T> {	6	interface Handler<T> {
7	(x:T) : void	7	(x: T): void
8	}	8	}
9		9
10	interface Initializer<T> {	10	interface Initializer<T> {
11	(notify: Handler<T>) : (() => void) \| void;	11	(notify: Handler<T>, error?: (e: any) => void, complete?: () => void): (() => void) \| void;
12	}	12	}
13		13
		14	// TODO: think about to move this interfaces.ts and make it public
		15	interface IObserver<T> {
		16	next(event: T): void
		17
		18	error(e: any): void
		19
		20	complete(): void
		21	}
14		22
15	class Observable<T> implements IObservable<T>, IDestroyable {	23	class Observable<T> implements IObservable<T>, IDestroyable {
16	private _once = new Array<~~Handl~~er<T>>();	24	private _once = new Array<IObserver<T>>();
		25
		26	private _observers = new Array<IObserver<T>>();
17		27
18	private readonly _observers = new Array<Handler<T>>();	28	private _cleanup: (() => void) \| void;
19		29
20	private readonly _cleanup : (() => void) \| void;	30	private _complete: boolean
		31
		32	private _error: any
21		33
22	constructor(func?: Initializer<T>) {	34	constructor(func?: Initializer<T>) {
23	this._cleanup = func && func(~~this~~.~~_notify~~.~~bind~~(~~this));~~	35	this._cleanup = func && func(
		36	this._notifyNext.bind(this),
		37	this._notifyError.bind(this),
		38	this._notifyCompleted.bind(this)
		39	);
24	}	40	}
25		41
26	on(observer: Handler<T>, error?: Handler<any>, complete?: () => void): IDestroyable {	42	/**
27	argumentNotNull(observer, "observer");	43	* Registers handlers for the current observable object.
28		44	*
29	this._observers.push(observer);	45	* @param next the handler for events
		46	* @param error the handler for a error
		47	* @param complete the handler for a completion
		48	* @returns {IDestroyable} the handler for the current subscription, this
		49	* handler can be used to unsubscribe from events.
		50	*
		51	*/
		52	on(next: Handler<T>, error?: Handler<any>, complete?: () => void): IDestroyable {
		53	argumentNotNull(next, "next");
30		54
31	let me = this;	55	let me = this;
32	return {	56
		57	let observer: IObserver<T> & IDestroyable = {
		58	next: next,
		59
		60	error(e: any) {
		61	if (error)
		62	error(e);
		63	},
		64
		65	complete() {
		66	if (complete)
		67	complete();
		68	},
		69
33	destroy() {	70	destroy() {
34	me._removeObserver(~~observer~~);	71	me._removeObserver(this);
35	}	72	}
36	}	73	}
		74
		75	this._addObserver(observer);
		76
		77
		78	return observer;
		79	}
		80
		81	private _addObserver(observer: IObserver<T>) {
		82	if (this._complete) {
		83	try {
		84	if (this._error)
		85	observer.error(this._error);
		86	else
		87	observer.complete();
		88	} catch (e) {
		89	this.onObserverException(e);
		90	}
		91	} else {
		92	this._observers.push(observer);
		93	}
37	}	94	}
38		95
		96	/**
		97	* Waits for the next event. This method can't be used to read messages
		98	* as a sequence since it can skip some messages between calls.
		99	*
		100	* @param ct a cancellation token
		101	*/
39	next(ct: ICancellation = Cancellation.none): Promise<T> {	102	next(ct: ICancellation = Cancellation.none): Promise<T> {
40	return new Promise<T>((resolve, reject) => {	103	return new Promise<T>((resolve, reject) => {
41	this._once.push(resolve);	104	let observer: IObserver<T> = {
42	if (ct.isSupported()) {	105	next: resolve,
		106	error: reject,
		107	complete: () => reject("No more events are available")
		108	};
		109
		110	if (this._addOnce(observer) && ct.isSupported()) {
43	ct.register((e) => {	111	ct.register((e) => {
44	this._removeOnce(~~resolve~~);	112	this._removeOnce(observer);
45	reject(e);	113	reject(e);
46	});	114	});
47	}	115	}
48	});	116	});
49	}	117	}
50		118
		119	private _addOnce(observer: IObserver<T>) {
		120	if (this._complete) {
		121	try {
		122	if (this._error)
		123	observer.error(this._error);
		124	else
		125	observer.complete();
		126	} catch (e) {
		127	this.onObserverException(e);
		128	}
		129	return false;
		130	}
		131
		132	this._once.push(observer);
		133	return true;
		134	}
		135
51	destroy() {	136	destroy() {
52	if(this._c~~leanup~~)	137	if (this._complete)
53	this._~~cleanup~~.~~call~~(~~null~~);	138	this._notifyCompleted();
		139
		140	let cleanup = this._cleanup;
		141	if (cleanup) {
		142	this._cleanup = null;
		143	cleanup();
		144	}
54	}	145	}
55		146
56	protected onObserverException(e: any) {	147	protected onObserverException(e: any) {
57	}	148	}
58		149
59	private _removeOnce(d: ~~Handl~~er<T>) {	150	private _removeOnce(d: IObserver<T>) {
60	let i = this._once.indexOf(d);	151	let i = this._once.indexOf(d);
61	if (i >= 0)	152	if (i >= 0)
62	this._once.splice(i);	153	this._once.splice(i);
63	}	154	}
64		155
65	private _removeObserver(d: ~~Handl~~er<T>) {	156	private _removeObserver(d: IObserver<T>) {
66	let i = this._observers.indexOf(d);	157	let i = this._observers.indexOf(d);
67	if (i >= 0)	158	if (i >= 0)
68	this._observers.splice(i);	159	this._observers.splice(i);
69	}	160	}
70		161
71	protected _notify(evt: T) {	162	private _notify(guard: (observer: IObserver<T>) => void) {
72	let guard = (observer: Handler<T>) => {
73	try {
74	observer(evt);
75	} catch (e) {
76	this.onObserverException(e);
77	}
78	}
79
80	if (this._once.length) {	163	if (this._once.length) {
81	for (let i = 0; i < this._once.length; i++)	164	for (let i = 0; i < this._once.length; i++)
82	guard(this._once[i]);	165	guard(this._once[i]);
83	this._once = [];	166	this._once = [];
84	}	167	}
85		168
86	for (let i = 0; i < this._observers.length; i++)	169	for (let i = 0; i < this._observers.length; i++)
87	guard(this._observers[i]);	170	guard(this._observers[i]);
88	}	171	}
		172
		173	protected _notifyNext(evt: T) {
		174	let guard = (observer: IObserver<T>) => {
		175	try {
		176	observer.next(evt);
		177	} catch (e) {
		178	this.onObserverException(e);
		179	}
		180	}
		181
		182	this._notify(guard);
		183	}
		184
		185	protected _notifyError(e: any) {
		186	let guard = (observer: IObserver<T>) => {
		187	try {
		188	observer.error(e);
		189	} catch (e) {
		190	this.onObserverException(e);
		191	}
		192	}
		193
		194	this._notify(guard);
		195	this._observers = [];
		196	}
		197
		198	protected _notifyCompleted() {
		199	let guard = (observer: IObserver<T>) => {
		200	try {
		201	observer.complete();
		202	} catch (e) {
		203	this.onObserverException(e);
		204	}
		205	}
		206
		207	this._notify(guard);
		208	this._observers = [];
		209	}
89	}	210	}
90		211
91	namespace Observable {	212	namespace Observable {
92	}	213	}
93		214
94	export = Observable; No newline at end of file	215	export = Observable;

src/ts/log/TraceSource.ts +1 -1

             import * as format from '../text/format'
             import { argumentNotNull } from '../safe';
             import * as Observable from '../components/Observable'
             import { IDestroyable } from '../interfaces';
             import * as TraceEvent from './TraceEvent'
             class Registry {
                 static readonly instance = new Registry();
                 private _registry: object = new Object();
                 private _listeners: object = new Object();
                 private _nextCookie: number = 1;
                 get(id: any): TraceSource {
                     argumentNotNull(id, "id");
                     if (this._registry[id])
                         return this._registry[id];
                     var source = new TraceSource(id);
                     this._registry[id] = source;
                     this._onNewSource(source);
                     return source;
                 }
                 add(id: any, source: TraceSource) {
                     argumentNotNull(id, "id");
                     argumentNotNull(source, "source");
                     this._registry[id] = source;
                     this._onNewSource(source);
                 }
                 _onNewSource(source: TraceSource) {
                     for (let i in this._listeners)
                         this._listeners[i].call(null, source);
                 }
                 on(handler: (source: TraceSource) => void): IDestroyable {
                     argumentNotNull(handler, "handler");
                     var me = this;
                     var cookie = this._nextCookie++;
                     this._listeners[cookie] = handler;
                     for (let i in this._registry)
                         handler(this._registry[i]);
                     return {
                         destroy() {
                             delete me._listeners[cookie];
                         }
                     };
                 }
             }
             class TraceSource extends Observable<TraceEvent> {
                 readonly id: any
                 level: number
                 constructor(id: any) {
                     super();
                     this.id = id || new Object();
                 }
                 protected emit(level: number, arg: any) {
-                    this._notify(new TraceEvent(this, level, arg));
+                    this._notifyNext(new TraceEvent(this, level, arg));
                 }
                 isDebugEnabled() {
                     return this.level >= TraceSource.DebugLevel;
                 }
                 debug(msg: string, ...args: any[]) {
                     if (this.isEnabled(TraceSource.DebugLevel))
                         this.emit(TraceSource.DebugLevel, format(msg, args));
                 }
                 isLogEnabled() {
                     return this.level >= TraceSource.LogLevel;
                 }
                 log(msg: string, ...args: any[]) {
                     if (this.isEnabled(TraceSource.LogLevel))
                         this.emit(TraceSource.LogLevel, format(msg, args));
                 }
                 isWarnEnabled() {
                     return this.level >= TraceSource.WarnLevel;
                 }
                 warn(msg: string, ...args: any[]) {
                     if (this.isEnabled(TraceSource.WarnLevel))
                         this.emit(TraceSource.WarnLevel, format(msg, args));
                 }
                 /**
                  * returns true if errors will be recorded.
                  */
                 isErrorEnabled() {
                     return this.level >= TraceSource.ErrorLevel;
                 }
                 /**
                  * Traces a error.
                  *
                  * @param msg the message.
                  * @param args parameters which will be substituted in the message.
                  */
                 error(msg: string, ...args: any[]) {
                     if (this.isEnabled(TraceSource.ErrorLevel))
                         this.emit(TraceSource.ErrorLevel, format(msg, args));
                 }
                 /**
                  * Checks whether the specified level is enabled for this
                  * trace source.
                  *
                  * @param level the trace level which should be checked.
                  */
                 isEnabled(level: number) {
                     return (this.level >= level);
                 }
                 /**
                  * Traces a raw event, passing data as it is to the underlying listeners
                  *
                  * @param level the level of the event
                  * @param arg the data of the event, can be a simple string or any object.
                  */
                 traceEvent(level: number, arg: any) {
                     if (this.isEnabled(level))
                         this.emit(level, arg);
                 }
                 /**
                  * Register the specified handler to be called for every new and already
                  * created trace source.
                  *
                  * @param handler the handler which will be called for each trace source
                  */
                 static on(handler: (source: TraceSource) => void) {
                     return Registry.instance.on(handler);
                 }
                 /**
                  * Creates or returns already created trace source for the specified id.
                  *
                  * @param id the id for the trace source
                  */
                 static get(id: any) {
                     return Registry.instance.get(id);
                 }
             }
             namespace TraceSource {
                 export const DebugLevel = 400;
                 export const LogLevel = 300;
                 export const WarnLevel = 200;
                 export const ErrorLevel = 100;
                 export const SilentLevel = 0;
             }
             export = TraceSource;

src/ts/log/writers/ConsoleWriter.ts +21 -15

@@ -1,29 +1,35
1	import { IObservable } from "../../interfaces";	1	import { IObservable, IDestroyable, ICancellation } from "../../interfaces";
2	import * as TraceEvent from '../TraceEvent';	2	import * as TraceEvent from '../TraceEvent';
3	import { ICancellation } from "../../interfaces";
4	import { Cancellation } from "../../Cancellation";	3	import { Cancellation } from "../../Cancellation";
5	import * as TraceSource from "../TraceSource";	4	import * as TraceSource from "../TraceSource";
6		5
7	class ConsoleWriter {	6	class ConsoleWriter implements IDestroyable {
8	async write(source: IObservable<TraceEvent>, ct: ICancellation = Cancellation.none) {	7	readonly _subscriptions = new Array<IDestroyable>();
9	let next;	8
10	while(next = await source.next(ct)) {	9	writeEvents(source: IObservable<TraceEvent>, ct: ICancellation = Cancellation.none) {
11	this._writeEvent(~~nex~~t);	10	var subscription = source.on(this.writeEvent.bind(this));
		11	if (ct.isSupported()) {
		12	ct.register(subscription.destroy.bind(subscription));
		13	}
		14	this._subscriptions.push(subscription);
		15	}
		16
		17	writeEvent(next: TraceEvent) {
		18	if (next.level >= TraceSource.LogLevel) {
		19	console.log(next.source.id.toString(), next.arg);
		20	} else if(next.level >= TraceSource.WarnLevel) {
		21	console.warn(next.source.id.toString(), next.arg);
		22	} else {
		23	console.error(next.source.id.toString(), next.arg);
12	}	24	}
13	}	25	}
14		26
15	private _writeEvent(next: TraceEvent) {	27	destroy() {
16	if (next.level >= TraceSource.LogLevel) {	28	this._subscriptions.forEach(x => x.destroy());
17	console.log(next.source.toString(), next.arg);
18	} else if(next.level >= TraceSource.WarnLevel) {
19	console.warn(next.source.toString(), next.arg);
20	} else {
21	console.error(next.source.toString(), next.arg);
22	}
23	}	29	}
24	}	30	}
25		31
26	namespace ConsoleWriter {	32	namespace ConsoleWriter {
27	}	33	}
28		34
29	export = ConsoleWriter; No newline at end of file	35	export = ConsoleWriter;

test/ts/TraceSourceTests.ts +13 -5

             import * as TraceSource from '@implab/core/log/TraceSource'
             import * as tape from 'tape';
             import * as ConsoleWriter from '@implab/core/log/writers/ConsoleWriter';
+            import { TapeWriter } from './TestTraits';
             const sourceId = 'test/TraceSourceTests';
             tape('trace message', t => {
                 let trace = TraceSource.get(sourceId);
                 trace.level = TraceSource.DebugLevel;
                 let h = trace.on((ev) => {
                     t.equal(ev.source, trace, "sender should be the current trace source");
                     t.equal(ev.level, TraceSource.DebugLevel, "level should be debug level");
                     t.equal(ev.arg, "Hello, World!", "The message should be a formatted message");
                     t.end();
                 });
                 trace.debug("Hello, {0}!", "World");
                 h.destroy();
             });
             tape('trace event', t => {
                 let trace = TraceSource.get(sourceId);
                 trace.level = TraceSource.DebugLevel;
                 let event = {
                     name: "custom event"
                 };
                 let h = trace.on((ev) => {
                     t.equal(ev.source, trace, "sender should be the current trace source");
                     t.equal(ev.level, TraceSource.DebugLevel, "level should be debug level");
                     t.equal(ev.arg, event, "The message should be the specified object");
                     t.end();
                 });
                 trace.traceEvent(TraceSource.DebugLevel, event);
                 h.destroy();
             });
-            tape('console writer', async t => {
+            tape('tape comment writer', async t => {
-                let writer = new ConsoleWriter();
+                let writer = new TapeWriter(t);
+                TraceSource.on(ts => {
+                    writer.writeEvents(ts);
+                });
                 let trace = TraceSource.get(sourceId);
                 trace.level = TraceSource.DebugLevel;
-                let p = writer.write(trace);
                 trace.log("Hello, {0}!", 'World');
+                trace.log("Multi\n  line");
                 trace.warn("Look at me!");
                 trace.error("DIE!");
-                console.log("DONE");
+                writer.destroy();
+                trace.log("You shouldn't see it!");
+                t.comment("DONE");
                 t.end();
             });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages