implab/implabjs-core Commit - r10:57344e243cdf

rewritten TraceSource

cin -

r10:57344e243cdf propose cancellat...

parent child

Context file:

r10:57344e243cdf

Collapse all files

src/ts/log/trace.ts created 644 +12 0

@@ -0,0 +1,12
	1	declare interface ILog {
	2	debug(...args: any[]): void;
	3	log(...args: any[]): void;
	4	warn(...args: any[]): void;
	5	error(...args: any[]): void;
	6	}
	7
	8	declare module "@implab/core/log/trace!*" {
	9	const channel: ILog;
	10
	11	export = channel;
	12	} No newline at end of file

src/ts/safe.d.ts created 644 +1 0

	@@ -0,0 +1,1
				1	export declare function argumentNotNull(v: any, paramName: string); 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": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+                      "resolved": "http://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.5",
+                  "version": "2.3.6",
-                  "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
+                  "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
-                  "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
+                  "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
                   "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": "2.9.2",
+                  "version": "3.0.3",
-                  "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+                  "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz",
-                  "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+                  "integrity": "sha512-kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==",
                   "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
                     }
                   }
                 }
               }
             }

run-amd-tests.js +4 0

             var requirejs = require('requirejs');
             requirejs.config({
                 baseUrl: '.',
                 map: {
                     "*": {
                         "@implab/core": "core"
                     }
                 },
                 packages: [{
                         name: "core",
                         location: "build/dist"
                     },
                     {
                         name: "test",
                         location: "build/test"
+                    },
+                    {
+                        name: "dojo",
+                        location: "node_modules/dojo"
                     }
                 ],
                 nodeRequire: require
             });
             requirejs(['test/plan']);

src/js/log/trace.js +23 -89

@@ -1,116 +1,50
1	define([".~~./text/format~~"], function (~~format~~) {	1	define(["./TraceSource"], function (TraceSource) {
2	'use strict';	2	'use strict';
3		3
4	var listeners = [];	4	return {
5	var channels = {};
6
7	var Trace = function (name) {
8	this.name = name;
9	this._subscribers = [];
10	};
11
12	Trace.prototype.debug = function () {
13	if (Trace.level >= 4)
14	this.notify("debug", format.apply(null, arguments));
15	};
16
17	Trace.prototype.log = function () {
18	if (Trace.level >= 3)
19	this.notify("log", format.apply(null, arguments));
20	};
21
22	Trace.prototype.warn = function () {
23	if (Trace.level >= 2)
24	this.notify("warn", format.apply(null, arguments));
25
26	};
27
28	Trace.prototype.error = function () {
29	if (Trace.level >= 1)
30	this.notify("error", format.apply(null, arguments));
31	};
32		5
33	Trace.prototype.notify = function (name, msg) {	6	on: function (filter, cb) {
34	var me = this;
35	me._subscribers.forEach(function (cb) {
36	cb(me, name, msg);
37	});
38	};
39
40	Trace.prototype.subscribe = function (cb) {
41	this._subscribers.push(cb);
42	};
43
44	Trace.prototype.toString = function () {
45	return this.name;
46	};
47
48	Trace.createChannel = function (type, name, cb) {
49	var chId = name;
50	if (channels[chId])
51	return channels[chId];
52
53	var channel = new type(chId);
54	channels[chId] = channel;
55
56	Trace._onNewChannel(chId, channel);
57	cb(channel);
58	};
59
60	Trace._onNewChannel = function (chId, ch) {
61	listeners.forEach(function (listener) {
62	listener(chId, ch);
63	});
64	};
65
66	Trace.on = function (filter, cb) {
67	if (arguments.length == 1) {	7	if (arguments.length == 1) {
68	cb = filter;	8	cb = filter;
69	filter = undefined;	9	filter = undefined;
70	}	10	}
71	var d, test;	11	var test;
72	if (filter instanceof RegExp) {	12	if (filter instanceof RegExp) {
73	test = function (chId) {	13	test = function (chId) {
74	return filter.test(chId);	14	return filter.test(chId);
75	};	15	};
76	} else if (filter instanceof Function) {	16	} else if (filter instanceof Function) {
77	test = filter;	17	test = filter;
78	} else if (filter) {	18	} else if (filter) {
79	test = function (chId) {	19	test = function (chId) {
80	return chId == filter;	20	return chId == filter;
81	};	21	};
82	}	22	}
83		23
84	if (test) {	24	if (test) {
85	d = ~~function~~(~~chId~~, ch) {	25	TraceSource.on(function (source) {
86	if(test(~~chI~~d))	26	if (test(source.id))
87	ch.~~subscribe~~(cb);	27	source.on(cb);
88	};	28	});
89	} else {	29	} else {
90	d = ~~function~~(~~chId~~, ch) {	30	TraceSource.on(function (source) {
91	ch.~~subscribe~~(cb);	31	source.on(cb);
92	};	32	});
93	}	33	}
94	listeners.push(d);	34	},
95
96	for(var chId in channels)
97	d(chId,channels[chId]);
98	};
99		35
100	~~Trace~~.load = function (id, require, cb) {	36	load: function (id, require, cb) {
101	if (id)	37	if (id) {
102	Trace.createChannel(Trace, id, cb);	38	cb(TraceSource.get(id));
103	else if (require.module && require.module.mid)	39	} else if (require.module && require.module.mid) {
104	Trace.~~createChannel~~(~~Trace~~, require.module.mid, cb);	40	cb(TraceSource.get(require.module.mid));
105	else	41	} else {
106	require(['module'], function (module) {	42	require(['module'], function (module) {
107	Trace.~~createChannel~~(~~Trace~~, module && module.id, cb);	43	cb(TraceSource.get(module && module.id));
108	});	44	});
109	};	45	}
110		46	},
111	Trace.dynamic = true;
112		47
113	Trace.level = 4;	48	dynamic: true,
114		49	};
115	return Trace;
116	}); No newline at end of file	50	});

src/ts/components/ActivatableMixin.ts +3 -1

             import { IActivationController } from './IActivationController';
             import { IActivatable } from './IActivatable';
             import { AsyncComponent } from './AsyncComponent';
             import { ICancellation } from '../ICancellation';
             import { EmptyCancellation } from '../EmptyCancellation';
+            import * as log from '@implab/core/log/trace!';
             type Constructor<T = {}> = new (...args: any[]) => T;
             function ActivatableMixin<TBase extends Constructor<AsyncComponent>>(Base: TBase) {
                 return class extends Base implements IActivatable {
                     _controller: IActivationController;
                     _active: boolean;
                     isActive() {
                         return this._active;
                     }
                     getActivationController() {
                         return this._controller;
                     }
                     setActivationController(controller: IActivationController) {
                         this._controller = controller;
                     }
                     async onActivating(ct: ICancellation) {
                         if (this._controller)
                             await this._controller.activating(this, ct);
                     }
                     async onActivated(ct: ICancellation) {
                         if (this._controller)
                             await this._controller.activated(this, ct);
                     }
                     async activate(ct: ICancellation = EmptyCancellation.default) {
                         if (this.isActive())
                             return;
                         ct = this.startOperation(ct);
                         try {
                             await this.onActivating(ct);
                             this._active = true;
                             try {
                                 await this.onActivated(ct);
-                            } catch {
+                            } catch(e) {
+                                log.error(e);
                                 // TODO log error
                             }
                             this.completeSuccess();
                         } catch (e) {
                             this.completeFail(e);
                         }
                         return this.getCompletion();
                     }
                     async onDeactivating(ct: ICancellation) {
                         if (this._controller)
                             await this._controller.deactivating(this, ct);
                     }
                     async onDeactivated(ct: ICancellation) {
                         if (this._controller)
                             await this._controller.deactivated(this, ct);
                     }
                     async deactivate(ct: ICancellation = EmptyCancellation.default) {
                         if (!this.isActive())
                             return;
                         ct = this.startOperation(ct);
                         try {
                             await this.onDeactivating(ct);
                             this._active = false;
                             try {
                                 await this.onDeactivated(ct);
                             } catch {
                                 // TODO log error
                             }
                             this.completeSuccess();
                         } catch (e) {
                             this.completeFail(e);
                         }
                         return this.getCompletion();
                     }
                 }
             }
             namespace ActivatableMixin {
             }
             export = ActivatableMixin;

src/ts/log/TraceSource.ts +98 -39

-            import * as TraceEventArgs from './TraceEventArgs'
             import * as format from '../text/format'
+            import { argumentNotNull } from '../safe';
-            interface Handler {
+            interface TraceEventHandler {
-                (arg: TraceEventArgs): void;
+                (sender: TraceSource, level: number, arg: any): void;
+            }
+            interface TraceSourceHandler {
+                (source: TraceSource): void;
             }
             interface Destroyable {
                 destroy();
             }
-            class HandlerDescriptor implements Destroyable {
+            class Registry {
-                private _target: TraceSource
+                static readonly instance = new Registry();
+                private _registry: object = new Object();
+                private _listeners: object = new Object();
+                private _nextCookie: number = 1;
-                readonly handler: Handler;
+                get(id: any): TraceSource {
+                    argumentNotNull(id, "id");
+                    if (this._registry[id])
+                        return this._registry[id];
-                constructor(target: TraceSource, handler: Handler) {
+                    var source = new TraceSource(id);
-                    this._target = target;
+                    this._registry[id] = source;
-                    this.handler = handler;
+                    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: TraceSourceHandler): Destroyable {
+                    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() {
-                    this._target.remove(this);
+                            delete me._listeners[cookie];
+                        }
+                    };
                 }
             }
+            class TraceSource {
-            class TraceSource {
                 readonly id: any
-                private _handlers: Array<HandlerDescriptor>
+                // using array will provide faster iteration the with object
+                private _handlers: Array<TraceEventHandler> = new Array<TraceEventHandler>();
                 level: number
                 constructor(id: any) {
                     this.id = id || new Object();
-                    this._handlers = new Array<HandlerDescriptor>();
                 }
-                on(handler: Handler): Destroyable {
+                on(handler: TraceEventHandler): Destroyable {
-                    if (!handler)
+                    argumentNotNull(handler, "handler");
-                        throw new Error("A handler must be specified");
+                    var me = this;
+                    me._handlers.push(handler);
-                    let d = new HandlerDescriptor(this, handler)
+                    return {
+                        destroy() {
-                    this._handlers.push(d);
+                            me.remove(handler);
+                        }
-                    return d;
                 }
-                remove(cookie: any): void {
+                remove(handler: TraceEventHandler): void {
-                    let i = this._handlers.indexOf(cookie);
+                    let i = this._handlers.indexOf(handler);
                     if (i >= 0)
                         this._handlers.splice(i, 1);
                 }
-                protected emit(level: number, msg: string, ...args: any[]) {
+                protected emit(level: number, arg: any) {
-                    if (level <= this.level) {
+                    this._handlers.forEach(h => {
-                        let event = new TraceEventArgs(this, format(msg, args));
-                        this._handlers.forEach(d => {
                         try {
-                                d.handler.call(null, event);
+                            h(this, level, arg);
-                            } catch {
+                        } catch (e) {
                             // suppress error in log handlers
                         }
                     });
                 }
                 isDebugEnabled() {
                     return this.level >= TraceSource.DebugLevel;
                 }
-                debug(msg: string, ...args: any[]): void {
+                debug(msg: string, ...args: any[]) {
-                    this.emit(TraceSource.DebugLevel, msg, args);
+                    if (this.isEnabled(TraceSource.DebugLevel))
+                        this.emit(TraceSource.DebugLevel, format(msg, args));
                 }
                 isLogEnabled() {
                     return this.level >= TraceSource.LogLevel;
                 }
-                log(msg: string, ...args: any[]): void {
+                log(msg: string, ...args: any[]) {
-                    this.emit(TraceSource.LogLevel, msg, args);
+                    if (this.isEnabled(TraceSource.LogLevel))
+                        this.emit(TraceSource.LogLevel, format(msg, args));
                 }
                 isWarnEnabled() {
                     return this.level >= TraceSource.WarnLevel;
                 }
-                warn(msg: string, ...args: any[]): void {
+                warn(msg: string, ...args: any[]) {
-                    this.emit(TraceSource.WarnLevel, msg, args);
+                    if (this.isEnabled(TraceSource.WarnLevel))
+                        this.emit(TraceSource.WarnLevel, format(msg, args));
                 }
                 isErrorEnabled() {
                     return this.level >= TraceSource.ErrorLevel;
                 }
-                error(msg: string, ...args: any[]): void {
+                error(msg: string, ...args: any[]) {
-                    this.emit(TraceSource.ErrorLevel, msg, args);
+                    if (this.isEnabled(TraceSource.ErrorLevel))
+                        this.emit(TraceSource.ErrorLevel, format(msg, args));
+                }
+                isEnabled(level: number) {
+                    return (this.level >= level);
+                }
+                traceEvent(level: number, arg: any) {
+                    if (this.isEnabled(level))
+                        this.emit(level, arg);
+                }
+                static on(handler: TraceSourceHandler) {
+                    Registry.instance.on(handler);
+                }
+                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/TraceEventArgs.ts removed 0 -20

NO CONTENT: file was removed

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