implab/implabjs-core Commit - r33:58f57bdfc295

minor fixes, code cleanup...

cin -

r33:58f57bdfc295 di-typescript

parent child

Context file:

r33:58f57bdfc295

Collapse all files

.project created 644 +17 0

@@ -0,0 +1,17
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<projectDescription>
	3	<name>core</name>
	4	<comment>Project core created by Buildship.</comment>
	5	<projects>
	6	</projects>
	7	<buildSpec>
	8	<buildCommand>
	9	<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
	10	<arguments>
	11	</arguments>
	12	</buildCommand>
	13	</buildSpec>
	14	<natures>
	15	<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
	16	</natures>
	17	</projectDescription>

.settings/org.eclipse.buildship.core.prefs created 644 +2 0

@@ -0,0 +1,2
	1	connection.project.dir=
	2	eclipse.preferences.version=1

.vscode/settings.json created 644 +4 0

@@ -0,0 +1,4
	1	{
	2	"java.configuration.updateBuildConfiguration": "disabled",
	3	"tslint.enable": true
	4	} No newline at end of file

src/ts/di.ts created 644 +126 0

@@ -0,0 +1,126
	1	import { TraceSource } from "./log/TraceSource";
	2	import { argumentNotNull, argumentNotEmptyString, isPrimitive, each, isNull } from "./safe";
	3	import { Uuid } from './Uuid';
	4	import {ActivationContext} from "./di/ActivationContext";
	5
	6	let trace = TraceSource.get("di");
	7
	8	export interface Descriptor {
	9	activate(context: ActivationContext, name: string): any
	10	}
	11
	12	export function isDescriptor(value: any): value is Descriptor {
	13	return ("activate" in value);
	14	}
	15
	16	export interface ServiceMap {
	17	[s: string] : Descriptor
	18	}
	19
	20	export class ActivationContextInfo {
	21	name: string
	22
	23	service: string
	24
	25	scope: ServiceMap
	26	}
	27
	28	export class ActivationError {
	29	activationStack: ActivationContextInfo[]
	30
	31	service: string
	32
	33	innerException: any
	34
	35	message: string
	36
	37	constructor(service: string, activationStack: ActivationContextInfo[], innerException) {
	38	this.message = "Failed to activate the service";
	39	this.activationStack = activationStack;
	40	this.service = service;
	41	this.innerException = innerException;
	42	}
	43
	44	toString() {
	45	var parts = [this.message];
	46	if (this.service)
	47	parts.push("when activating: " + this.service.toString());
	48
	49	if (this.innerException)
	50	parts.push("caused by: " + this.innerException.toString());
	51
	52	if (this.activationStack) {
	53	parts.push("at");
	54	this.activationStack.forEach(function (x) {
	55	parts.push(" " + x.name + " " +
	56	(x.service ? x.service.toString() : ""));
	57	});
	58	}
	59
	60	return parts.join("\n");
	61	}
	62	}
	63
	64
	65	export enum ActivationType {
	66	SINGLETON,
	67	CONTAINER,
	68	HIERARCHY,
	69	CONTEXT,
	70	CALL
	71	}
	72
	73
	74
	75	interface ServiceDescriptorParams {
	76
	77	}
	78
	79	class ServiceDescriptor extends Descriptor {
	80	constructor(opts: ServiceDescriptorParams) {
	81	super();
	82	}
	83
	84	activate(context: ActivationContext, name: string) {
	85	throw new Error("Method not implemented.");
	86	}
	87	isInstanceCreated(): boolean {
	88	throw new Error("Method not implemented.");
	89	}
	90	getInstance() {
	91	throw new Error("Method not implemented.");
	92	}
	93	}
	94
	95
	96
	97	class AggregateDescriptor<T> extends Descriptor {
	98	constructor(value: T) {
	99	super();
	100	}
	101
	102	activate(context: ActivationContext, name: string) {
	103	throw new Error("Method not implemented.");
	104	}
	105	isInstanceCreated(): boolean {
	106	throw new Error("Method not implemented.");
	107	}
	108	getInstance(): T {
	109	throw new Error("Method not implemented.");
	110	}
	111	}
	112
	113	class ValueDescriptor<T> implements Descriptor {
	114	activate(context: ActivationContext, name: string) {
	115	throw new Error("Method not implemented.");
	116	}
	117	isInstanceCreated(): boolean {
	118	throw new Error("Method not implemented.");
	119	}
	120	getInstance(): T {
	121	throw new Error("Method not implemented.");
	122	}
	123	constructor(value: T) {
	124
	125	}
	126	} No newline at end of file

src/ts/di/ActivationContext.ts created 644 +132 0

@@ -0,0 +1,132
	1	import { TraceSource } from "../log/TraceSource";
	2	import { argumentNotNull, argumentNotEmptyString, isPrimitive, each, isNull } from "../safe";
	3	import { Uuid } from '../Uuid';
	4	import { Container, ActivationContextInfo, ServiceMap, Descriptor, isDescriptor } from "../di";
	5
	6	let trace = TraceSource.get("di");
	7
	8
	9	export class ActivationContext {
	10	_cache: object
	11
	12	_services: ServiceMap
	13
	14	_stack: ActivationContextInfo[]
	15
	16	_visited: any
	17
	18	container: any
	19
	20
	21	constructor(container: Container, services: ServiceMap, cache?: object, visited?) {
	22	argumentNotNull(container, "container");
	23	argumentNotNull(services, "services");
	24
	25	this._visited = visited \|\| {};
	26	this._stack = [];
	27	this._cache = cache \|\| {};
	28	this._services = services;
	29	this.container = container;
	30	}
	31
	32	getService(name, def?): any {
	33	let d = this._services[name];
	34
	35	if (!d)
	36	if (arguments.length > 1)
	37	return def;
	38	else
	39	throw new Error("Service '" + name + "' not found");
	40
	41	return d.activate(this, name);
	42	}
	43
	44	/**
	45	* registers services local to the the activation context
	46	*
	47	* @name{string} the name of the service
	48	* @service{string} the service descriptor to register
	49	*/
	50	register(name: string, service: Descriptor) {
	51	argumentNotEmptyString(name, "name");
	52
	53	this._services[name] = service;
	54	}
	55
	56	clone() {
	57	return new ActivationContext(
	58	this.container,
	59	Object.create(this._services),
	60	this._cache,
	61	this._visited
	62	);
	63
	64	}
	65
	66	has(id) {
	67	return id in this._cache;
	68	}
	69
	70	get(id) {
	71	return this._cache[id];
	72	}
	73
	74	store(id, value) {
	75	return (this._cache[id] = value);
	76	}
	77
	78	parse(data: any, name) {
	79	var me = this;
	80	if (isPrimitive(data))
	81	return data;
	82
	83	if (isDescriptor(data)) {
	84	return data.activate(this, name);
	85	} else if (data instanceof Array) {
	86	me.enter(name);
	87	var v = data.map(function (x, i) {
	88	return me.parse(x, "." + i);
	89	});
	90	me.leave();
	91	return v;
	92	} else {
	93	me.enter(name);
	94	var result = {};
	95	for (var p in data)
	96	result[p] = me.parse(data[p], "." + p);
	97	me.leave();
	98	return result;
	99	}
	100	}
	101
	102	visit(id) {
	103	var count = this._visited[id] \|\| 0;
	104	this._visited[id] = count + 1;
	105	return count;
	106	}
	107
	108	getStack() {
	109	return this._stack.slice().reverse();
	110	}
	111
	112	enter(name, d?, localize?) {
	113	if (trace.isLogEnabled())
	114	trace.log("enter " + name + " " + (d \|\| "") +
	115	(localize ? " localize" : ""));
	116	this._stack.push({
	117	name: name,
	118	service: d,
	119	scope: this._services
	120	});
	121	if (localize)
	122	this._services = Object.create(this._services);
	123	}
	124
	125	leave() {
	126	var ctx = this._stack.pop();
	127	this._services = ctx.scope;
	128
	129	if (trace.isLogEnabled())
	130	trace.log("leave " + ctx.name + " " + (ctx.service \|\| ""));
	131	}
	132	} No newline at end of file

src/ts/di/Container.ts created 644 +282 0

@@ -0,0 +1,282
	1	import { Uuid } from "../Uuid";
	2	import { ActivationContext } from "./ActivationContext";
	3	import { ActivationError } from "../di";
	4
	5
	6	export class Container {
	7	_services
	8
	9	_cache
	10
	11	_cleanup: any[]
	12
	13	_root: Container
	14
	15	_parent: Container
	16
	17	constructor(parent?: Container) {
	18	this._parent = parent;
	19	this._services = parent ? Object.create(parent._services) : {};
	20	this._cache = {};
	21	this._cleanup = [];
	22	this._root = parent ? parent.getRootContainer() : this;
	23	this._services.container = new ValueDescriptor(this);
	24	}
	25
	26	getRootContainer() {
	27	return this._root;
	28	}
	29
	30	getParent() {
	31	return this._parent;
	32	}
	33
	34	getService<T = any>(name: string, def?: T) {
	35	let d = this._services[name];
	36	if (!d)
	37	if (arguments.length > 1)
	38	return def;
	39	else
	40	throw new Error("Service '" + name + "' isn't found");
	41
	42	if (d.isInstanceCreated())
	43	return d.getInstance();
	44
	45	var context = new ActivationContext(this, this._services);
	46
	47	try {
	48	return d.activate(context, name);
	49	} catch (error) {
	50	throw new ActivationError(name, context.getStack(), error);
	51	}
	52	}
	53
	54	register(nameOrCollection, service?) {
	55	if (arguments.length == 1) {
	56	var data = nameOrCollection;
	57	for (let name in data)
	58	this.register(name, data[name]);
	59	} else {
	60	if (!(service instanceof Descriptor))
	61	service = new ValueDescriptor(service);
	62	this._services[nameOrCollection] = service;
	63	}
	64	return this;
	65	}
	66
	67	onDispose(callback) {
	68	if (!(callback instanceof Function))
	69	throw new Error("The callback must be a function");
	70	this._cleanup.push(callback);
	71	}
	72
	73	dispose() {
	74	if (this._cleanup) {
	75	for (var i = 0; i < this._cleanup.length; i++)
	76	this._cleanup[i].call(null);
	77	this._cleanup = null;
	78	}
	79	}
	80
	81	/**
	82	* @param{String\|Object} config
	83	* The configuration of the contaier. Can be either a string or an object,
	84	* if the configuration is an object it's treated as a collection of
	85	* services which will be registed in the contaier.
	86	*
	87	* @param{Function} opts.contextRequire
	88	* The function which will be used to load a configuration or types for services.
	89	*
	90	*/
	91	async configure(config, opts) {
	92	var me = this,
	93	contextRequire = (opts && opts.contextRequire);
	94
	95	if (typeof (config) === "string") {
	96	let args;
	97	if (!contextRequire) {
	98	var shim = [config, Uuid()].join(config.indexOf("/") != -1 ? "-" : "/");
	99	args = await new Promise((resolve, reject) => {
	100	define(shim, ["require", config], function (ctx, data) {
	101	resolve([data, {
	102	contextRequire: ctx
	103	}]);
	104	})
	105	});
	106	require([shim]);
	107	} else {
	108	// TODO how to get correct contextRequire for the relative config module?
	109	args = await new Promise((resolve, reject) => {
	110	contextRequire([config], function (data) {
	111	resolve([data, {
	112	contextRequire: contextRequire
	113	}]);
	114	});
	115	});
	116	}
	117
	118	return me._configure.apply(me, args);
	119	} else {
	120	return me._configure(config, opts);
	121	}
	122	}
	123
	124	createChildContainer() {
	125	return new Container(this);
	126	}
	127
	128	has(id) {
	129	return id in this._cache;
	130	}
	131
	132	get(id) {
	133	return this._cache[id];
	134	}
	135
	136	store(id, value) {
	137	return (this._cache[id] = value);
	138	}
	139
	140	async _configure(data, opts) {
	141	var typemap = {},
	142	me = this,
	143	p,
	144	contextRequire = (opts && opts.contextRequire) \|\| require;
	145
	146	var services = {};
	147
	148	for (p in data) {
	149	var service = me._parse(data[p], typemap);
	150	if (!(service instanceof Descriptor))
	151	service = new AggregateDescriptor(service);
	152	services[p] = service;
	153	}
	154
	155	me.register(services);
	156
	157	var names = [];
	158
	159	for (p in typemap)
	160	names.push(p);
	161
	162	return new Promise((resolve, reject) => {
	163	if (names.length) {
	164	contextRequire(names, function () {
	165	for (var i = 0; i < names.length; i++)
	166	typemap[names[i]] = arguments[i];
	167	resolve(me);
	168	});
	169	} else {
	170	resolve(me);
	171	}
	172	});
	173
	174	}
	175
	176	_parse(data, typemap) {
	177	if (isPrimitive(data) \|\| data instanceof Descriptor)
	178	return data;
	179	if (data.$dependency) {
	180	return new ReferenceDescriptor(
	181	data.$dependency,
	182	data.lazy,
	183	data.optional,
	184	data["default"],
	185	data.services && this._parseObject(data.services, typemap));
	186	} else if (data.$value) {
	187	return !data.parse ?
	188	new ValueDescriptor(data.$value) :
	189	new AggregateDescriptor(this._parse(data.$value, typemap));
	190	} else if (data.$type \|\| data.$factory) {
	191	return this._parseService(data, typemap);
	192	} else if (data instanceof Array) {
	193	return this._parseArray(data, typemap);
	194	}
	195
	196	return this._parseObject(data, typemap);
	197	}
	198
	199	_parseService(data, typemap) {
	200	var me = this,
	201	opts: any = {
	202	owner: this
	203	};
	204	if (data.$type) {
	205
	206	opts.type = data.$type;
	207
	208	if (typeof (data.$type) === "string") {
	209	typemap[data.$type] = null;
	210	opts.typeMap = typemap;
	211	}
	212	}
	213
	214	if (data.$factory)
	215	opts.factory = data.$factory;
	216
	217	if (data.services)
	218	opts.services = me._parseObject(data.services, typemap);
	219	if (data.inject)
	220	opts.inject = data.inject instanceof Array ? data.inject.map(function (x) {
	221	return me._parseObject(x, typemap);
	222	}) : me._parseObject(data.inject, typemap);
	223	if (data.params)
	224	opts.params = me._parse(data.params, typemap);
	225
	226	if (data.activation) {
	227	if (typeof (data.activation) === "string") {
	228	switch (data.activation.toLowerCase()) {
	229	case "singleton":
	230	opts.activation = ActivationType.SINGLETON;
	231	break;
	232	case "container":
	233	opts.activation = ActivationType.CONTAINER;
	234	break;
	235	case "hierarchy":
	236	opts.activation = ActivationType.HIERARCHY;
	237	break;
	238	case "context":
	239	opts.activation = ActivationType.CONTEXT;
	240	break;
	241	case "call":
	242	opts.activation = ActivationType.CALL;
	243	break;
	244	default:
	245	throw new Error("Unknown activation type: " +
	246	data.activation);
	247	}
	248	} else {
	249	opts.activation = Number(data.activation);
	250	}
	251	}
	252
	253	if (data.cleanup)
	254	opts.cleanup = data.cleanup;
	255
	256	return new ServiceDescriptor(opts);
	257	}
	258
	259	_parseObject(data, typemap) {
	260	if (data.constructor &&
	261	data.constructor.prototype !== Object.prototype)
	262	return new ValueDescriptor(data);
	263
	264	var o = {};
	265
	266	for (var p in data)
	267	o[p] = this._parse(data[p], typemap);
	268
	269	return o;
	270	}
	271
	272	_parseArray(data, typemap) {
	273	if (data.constructor &&
	274	data.constructor.prototype !== Array.prototype)
	275	return new ValueDescriptor(data);
	276
	277	var me = this;
	278	return data.map(function (x) {
	279	return me._parse(x, typemap);
	280	});
	281	}
	282	} No newline at end of file

src/ts/di/Descriptor.ts created 644 +11 0

@@ -0,0 +1,11
	1	import { ActivationContext } from "./ActivationContext";
	2	import { isNull } from "../safe";
	3
	4	export interface Descriptor {
	5	activate(context: ActivationContext, name?: string);
	6	}
	7
	8	export function isDescriptor(instance): instance is Descriptor {
	9	return (!isNull(instance)) &&
	10	('activate' in instance);
	11	} No newline at end of file

src/ts/di/ReferenceDescriptor.ts created 644 +98 0

@@ -0,0 +1,98
	1	import { isNull, argumentNotEmptyString, each } from "../safe";
	2
	3	class ReferenceDescriptor extends Descriptor {
	4	_name: string
	5
	6	_lazy = false
	7
	8	_optional = false
	9
	10	_default: any
	11
	12	_services: object
	13
	14	constructor(name: string, lazy: boolean, optional: boolean, def, services: object) {
	15	super();
	16	argumentNotEmptyString(name, "name");
	17	this._name = name;
	18	this._lazy = Boolean(lazy);
	19	this._optional = Boolean(optional);
	20	this._default = def;
	21	this._services = services;
	22	}
	23
	24	activate(context: ActivationContext, name: string) {
	25	var me = this;
	26
	27	context.enter(name, this, true);
	28
	29	// добавляем сервисы
	30	if (me._services) {
	31	for (var p in me._services) {
	32	var sv = me._services[p];
	33	context.register(p, sv instanceof Descriptor ? sv : new AggregateDescriptor(sv));
	34	}
	35	}
	36
	37	if (me._lazy) {
	38	// сохраняем контекст активации
	39	context = context.clone();
	40	return function (cfg) {
	41	// защищаем контекст на случай исключения в процессе
	42	// активации
	43	var ct = context.clone();
	44	try {
	45	if (cfg)
	46	each(cfg, function (v, k) {
	47	ct.register(k, v instanceof Descriptor ? v : new AggregateDescriptor(v));
	48	});
	49	return me._optional ? ct.getService(me._name, me._default) : ct
	50	.getService(me._name);
	51	} catch (error) {
	52	throw new ActivationError(me._name, ct.getStack(), error);
	53	}
	54	};
	55	}
	56
	57	var v = me._optional ?
	58	context.getService(me._name, me._default) :
	59	context.getService(me._name);
	60
	61	context.leave();
	62	return v;
	63	}
	64
	65	isInstanceCreated() {
	66	return false;
	67	}
	68
	69	getInstance() {
	70	throw new Error("The reference descriptor doesn't allowed to hold an instance");
	71	}
	72
	73	toString() {
	74	var opts = [];
	75	if (this._optional)
	76	opts.push("optional");
	77	if (this._lazy)
	78	opts.push("lazy");
	79
	80	var parts = [
	81	"@ref "
	82	];
	83	if (opts.length) {
	84	parts.push("{");
	85	parts.push(opts.join());
	86	parts.push("} ");
	87	}
	88
	89	parts.push(this._name);
	90
	91	if (!isNull(this._default)) {
	92	parts.push(" = ");
	93	parts.push(this._default);
	94	}
	95
	96	return parts.join("");
	97	}
	98	} No newline at end of file

tsconfig.json created 644 +15 0

@@ -0,0 +1,15
	1	{
	2	"compilerOptions": {
	3	"target": "es5",
	4	"module": "amd",
	5	"sourceMap": true,
	6	"outDir" : "build/dist",
	7	"declaration": true,
	8	"lib": [
	9	"es2015"
	10	]
	11	},
	12	"include" : [
	13	"src/ts/*/.ts"
	14	]
	15	} No newline at end of file

tsconfig.test.json created 644 +15 0

@@ -0,0 +1,15
	1	{
	2	"compilerOptions": {
	3	"target": "es5",
	4	"module": "amd",
	5	"sourceMap": true,
	6	"outDir" : "build/test",
	7	"moduleResolution": "node",
	8	"lib": [
	9	"ES2015"
	10	]
	11	},
	12	"include" : [
	13	"test/ts/*/.ts"
	14	]
	15	} No newline at end of file

build.gradle +2 -2

             if (release != 'rtm') {
                 version += "-$release"
             }
             println "version: $version"
             def distDir = "$buildDir/dist"
             def testDir = "$buildDir/test"
             task clean {
                 doLast {
                     delete buildDir
                     delete 'node_modules/@implab'
                 }
             }
             task cleanNpm {
                 doLast {
                     delete 'node_modules'
                 }
             }
             task _npmInstall() {
                 inputs.file("package.json")
                 outputs.dir("node_modules")
                 doLast {
                     exec {
                         commandLine 'npm', 'install'
                     }
                 }
             }
             task _legacyJs(type:Copy) {
                 from 'src/js/'
                 into distDir
             }
             task _buildTs(dependsOn: _npmInstall, type:Exec) {
                 inputs.dir('src/ts')
                 inputs.file('tsc.json')
                 outputs.dir(distDir)
-                commandLine 'node_modules/.bin/tsc', '-p', 'tsc.json'
+                commandLine 'node_modules/.bin/tsc', '-p', 'tsconfig.json'
             }
             task _packageMeta(type: Copy) {
                 inputs.property("version", version)
                 from('.') {
                     include 'package.json', '.npmignore', 'readme.md', 'license', 'history.md'
                 }
                 into distDir
                 doLast {
                     exec {
                         workingDir distDir
                         commandLine 'npm', 'version', version
                     }
                 }
             }
             task build(dependsOn: [_npmInstall, _buildTs, _legacyJs, _packageMeta]) {
             }
             task _localInstall(dependsOn: build, type: Exec) {
                 inputs.file("$distDir/package.json")
                 outputs.upToDateWhen {
                     new File("$projectDir/node_modules/@implab/core").exists()
                 }
                 commandLine 'npm', 'install', '--no-save', '--force', distDir
             }
             task copyJsTests(type: Copy) {
                 from 'test/js'
                 into testDir
             }
             task buildTests(dependsOn: _localInstall, type: Exec) {
                 inputs.dir('test/ts')
                 inputs.file('tsc.test.json')
                 outputs.dir(testDir)
-                commandLine 'node_modules/.bin/tsc', '-p', 'tsc.test.json'
+                commandLine 'node_modules/.bin/tsc', '-p', 'tsconfig.test.json'
             }
             task test(dependsOn: [copyJsTests, buildTests], type: Exec) {
                 commandLine 'node', 'run-amd-tests.js'
             }
             task pack(dependsOn: build, type: Exec) {
                 workingDir = distDir
                 commandLine 'npm', 'pack'
             }

package-lock.json +62 -62

             {
               "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"
+                    "@types/node": "*"
                   }
                 },
                 "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",
+                    "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",
+                    "foreach": "^2.0.5",
-                    "object-keys": "1.0.12"
+                    "object-keys": "^1.0.8"
                   }
                 },
                 "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",
+                    "es-to-primitive": "^1.1.1",
-                    "function-bind": "1.1.1",
+                    "function-bind": "^1.1.1",
-                    "has": "1.0.3",
+                    "has": "^1.0.1",
-                    "is-callable": "1.1.3",
+                    "is-callable": "^1.1.3",
-                    "is-regex": "1.0.4"
+                    "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-callable": "^1.1.1",
-                    "is-date-object": "1.0.1",
+                    "is-date-object": "^1.0.1",
-                    "is-symbol": "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",
+                    "duplexer": "~0.1.1",
                     "minimist": "0.0.5",
-                    "sprintf": "0.1.5",
+                    "sprintf": "~0.1.3",
-                    "tap-parser": "0.4.3",
+                    "tap-parser": "~0.4.0",
-                    "tape": "2.3.3",
+                    "tape": "~2.3.2",
-                    "through2": "0.2.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",
                       "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",
+                        "deep-equal": "~0.1.0",
-                        "defined": "0.0.0",
+                        "defined": "~0.0.0",
-                        "inherits": "2.0.3",
+                        "inherits": "~2.0.1",
-                        "jsonify": "0.0.0",
+                        "jsonify": "~0.0.0",
-                        "resumer": "0.0.0",
+                        "resumer": "~0.0.0",
-                        "through": "2.3.8"
+                        "through": "~2.3.4"
                       }
                     }
                   }
                 },
                 "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"
+                    "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",
+                    "fs.realpath": "^1.0.0",
-                    "inflight": "1.0.6",
+                    "inflight": "^1.0.4",
-                    "inherits": "2.0.3",
+                    "inherits": "2",
-                    "minimatch": "3.0.4",
+                    "minimatch": "^3.0.4",
-                    "once": "1.4.0",
+                    "once": "^1.3.0",
-                    "path-is-absolute": "1.0.1"
+                    "path-is-absolute": "^1.0.0"
                   }
                 },
                 "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"
+                    "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",
+                    "once": "^1.3.0",
-                    "wrappy": "1.0.2"
+                    "wrappy": "1"
                   }
                 },
                 "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"
+                    "has": "^1.0.1"
                   }
                 },
                 "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"
+                    "brace-expansion": "^1.1.7"
                   }
                 },
                 "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"
+                    "wrappy": "1"
                   }
                 },
                 "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",
+                    "core-util-is": "~1.0.0",
-                    "inherits": "2.0.3",
+                    "inherits": "~2.0.1",
                     "isarray": "0.0.1",
-                    "string_decoder": "0.10.31"
+                    "string_decoder": "~0.10.x"
                   }
                 },
                 "requirejs": {
                   "version": "2.3.6",
                   "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
                   "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"
+                    "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"
+                    "through": "~2.3.4"
                   }
                 },
                 "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",
+                    "define-properties": "^1.1.2",
-                    "es-abstract": "1.12.0",
+                    "es-abstract": "^1.5.0",
-                    "function-bind": "1.1.1"
+                    "function-bind": "^1.0.2"
                   }
                 },
                 "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",
+                    "inherits": "~2.0.1",
-                    "readable-stream": "1.1.14"
+                    "readable-stream": "~1.1.11"
                   }
                 },
                 "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",
+                    "deep-equal": "~1.0.1",
-                    "defined": "1.0.0",
+                    "defined": "~1.0.0",
-                    "for-each": "0.3.3",
+                    "for-each": "~0.3.3",
-                    "function-bind": "1.1.1",
+                    "function-bind": "~1.1.1",
-                    "glob": "7.1.2",
+                    "glob": "~7.1.2",
-                    "has": "1.0.3",
+                    "has": "~1.0.3",
-                    "inherits": "2.0.3",
+                    "inherits": "~2.0.3",
-                    "minimist": "1.2.0",
+                    "minimist": "~1.2.0",
-                    "object-inspect": "1.6.0",
+                    "object-inspect": "~1.6.0",
-                    "resolve": "1.7.1",
+                    "resolve": "~1.7.1",
-                    "resumer": "0.0.0",
+                    "resumer": "~0.0.0",
-                    "string.prototype.trim": "1.1.2",
+                    "string.prototype.trim": "~1.1.2",
-                    "through": "2.3.8"
+                    "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",
+                    "readable-stream": "~1.1.9",
-                    "xtend": "2.1.2"
+                    "xtend": "~2.1.1"
                   }
                 },
                 "typescript": {
                   "version": "3.0.3",
                   "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz",
                   "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"
+                    "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/ts/Uuid.ts +17 -29

             // Typescript port of the uuid.js
             //  Copyright (c) 2018 Sergey Smirnov
             //  BSD-2-Clause License https://opensource.org/licenses/BSD-2-Clause
             //
             // uuid.js
             //     Copyright (c) 2010-2012 Robert Kieffer
             //     MIT License - http://opensource.org/licenses/mit-license.php
             declare var window: any;
             let _window: any = 'undefined' !== typeof window ? window : null;
             // Unique ID creation requires a high quality random # generator. We
             // feature
             // detect to determine the best RNG source, normalizing to a function
             // that
             // returns 128-bits of randomness, since that's what's usually required
             let _rng;
             function setupBrowser() {
                 // Allow for MSIE11 msCrypto
                 let _crypto = _window.crypto || _window.msCrypto;
                 if (!_rng && _crypto && _crypto.getRandomValues) {
                     // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
                     //
                     // Moderately fast, high quality
                     try {
                         let _rnds8 = new Uint8Array(16);
                         _rng = function whatwgRNG() {
                             _crypto.getRandomValues(_rnds8);
                             return _rnds8;
                         };
                         _rng();
                     } catch (e) { /**/ }
                 }
                 if (!_rng) {
                     // Math.random()-based (RNG)
                     //
                     // If all else fails, use Math.random(). It's fast, but is of
                     // unspecified
                     // quality.
                     let _rnds = new Array(16);
                     _rng = function () {
                         for (var i = 0, r; i < 16; i++) {
                             if ((i & 0x03) === 0) {
                                 r = Math.random() * 0x100000000;
                             }
                             _rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
                         }
                         return _rnds;
                     };
                     if ('undefined' !== typeof console && console.warn) {
                         console.warn("[SECURITY] node-uuid: crypto not usable, falling back to insecure Math.random()");
                     }
                 }
             }
             function setupNode() {
                 // Node.js crypto-based RNG -
                 // http://nodejs.org/docs/v0.6.2/api/crypto.html
                 //
                 // Moderately fast, high quality
                 if ('function' === typeof require) {
                     try {
                         let _rb = require('crypto').randomBytes;
                         _rng = _rb && function () {
                             return _rb(16);
                         };
                         _rng();
                     } catch (e) { /**/ }
                 }
             }
             if (_window) {
                 setupBrowser();
             } else {
                 setupNode();
             }
             // Buffer class to use
             let BufferClass = ('function' === typeof Buffer) ? Buffer : Array;
             // Maps for number <-> hex string conversion
             let _byteToHex = [];
             let _hexToByte = {};
             for (let i = 0; i < 256; i++) {
                 _byteToHex[i] = (i + 0x100).toString(16).substr(1);
                 _hexToByte[_byteToHex[i]] = i;
             }
             // **`parse()` - Parse a UUID into it's component bytes**
-            function parse(s, buf?, offset?) : Array<string> {
+            function _parse(s, buf?, offset?): Array<string> {
                 let i = (buf && offset) || 0, ii = 0;
                 buf = buf || [];
                 s.toLowerCase().replace(/[0-9a-f]{2}/g, function (oct) {
                     if (ii < 16) { // Don't overflow!
                         buf[i + ii++] = _hexToByte[oct];
                     }
                 });
                 // Zero out remaining bytes if string was short
                 while (ii < 16) {
                     buf[i + ii++] = 0;
                 }
                 return buf;
             }
             // **`unparse()` - Convert UUID byte array (ala parse()) into a string**
-            function unparse(buf, offset?) : string {
+            function _unparse(buf, offset?): string {
                 let i = offset || 0, bth = _byteToHex;
                 return bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]] +
                     bth[buf[i++]] + '-' + bth[buf[i++]] + bth[buf[i++]] + '-' +
                     bth[buf[i++]] + bth[buf[i++]] + '-' + bth[buf[i++]] +
                     bth[buf[i++]] + '-' + bth[buf[i++]] + bth[buf[i++]] +
                     bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]];
             }
             // **`v1()` - Generate time-based UUID**
             //
             // Inspired by https://github.com/LiosK/UUID.js
             // and http://docs.python.org/library/uuid.html
             // random #'s we need to init node and clockseq
             let _seedBytes = _rng();
             // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit =
             // 1)
             let _nodeId = [
                 _seedBytes[0] | 0x01,
                 _seedBytes[1],
                 _seedBytes[2],
                 _seedBytes[3],
                 _seedBytes[4],
                 _seedBytes[5]
             ];
             // Per 4.2.2, randomize (14 bit) clockseq
             let _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
             // Previous uuid creation time
             let _lastMSecs = 0, _lastNSecs = 0;
             // See https://github.com/broofa/node-uuid for API details
-            function v1(options?, buf?, offset?) : string {
+            function _v1(options?, buf?, offset?): string {
                 let i = buf && offset || 0;
                 let b = buf || [];
                 options = options || {};
                 let clockseq = (options.clockseq != null) ? options.clockseq : _clockseq;
                 // UUID timestamps are 100 nano-second units since the Gregorian
                 // epoch,
                 // (1582-10-15 00:00). JSNumbers aren't precise enough for this, so
                 // time is handled internally as 'msecs' (integer milliseconds) and
                 // 'nsecs'
                 // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01
                 // 00:00.
                 let msecs = (options.msecs != null) ? options.msecs : new Date()
                     .getTime();
                 // Per 4.2.1.2, use count of uuid's generated during the current
                 // clock
                 // cycle to simulate higher resolution clock
                 let nsecs = (options.nsecs != null) ? options.nsecs : _lastNSecs + 1;
                 // Time since last uuid creation (in msecs)
                 let dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs) / 10000;
                 // Per 4.2.1.2, Bump clockseq on clock regression
                 if (dt < 0 && options.clockseq == null) {
                     clockseq = clockseq + 1 & 0x3fff;
                 }
                 // Reset nsecs if clock regresses (new clockseq) or we've moved onto
                 // a new
                 // time interval
                 if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
                     nsecs = 0;
                 }
                 // Per 4.2.1.2 Throw error if too many uuids are requested
                 if (nsecs >= 10000) {
                     throw new Error(
                         'uuid.v1(): Can\'t create more than 10M uuids/sec');
                 }
                 _lastMSecs = msecs;
                 _lastNSecs = nsecs;
                 _clockseq = clockseq;
                 // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
                 msecs += 12219292800000;
                 // `time_low`
                 let tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
                 b[i++] = tl >>> 24 & 0xff;
                 b[i++] = tl >>> 16 & 0xff;
                 b[i++] = tl >>> 8 & 0xff;
                 b[i++] = tl & 0xff;
                 // `time_mid`
                 let tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
                 b[i++] = tmh >>> 8 & 0xff;
                 b[i++] = tmh & 0xff;
                 // `time_high_and_version`
                 b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
                 b[i++] = tmh >>> 16 & 0xff;
                 // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
                 b[i++] = clockseq >>> 8 | 0x80;
                 // `clock_seq_low`
                 b[i++] = clockseq & 0xff;
                 // `node`
                 let node = options.node || _nodeId;
                 for (let n = 0; n < 6; n++) {
                     b[i + n] = node[n];
                 }
-                return buf ? buf : unparse(b);
+                return buf ? buf : _unparse(b);
             }
             // **`v4()` - Generate random UUID**
             // See https://github.com/broofa/node-uuid for API details
-            function v4(options?, buf?, offset?) : string {
+            function _v4(options?, buf?, offset?): string {
                 // Deprecated - 'format' argument, as supported in v1.2
                 let i = buf && offset || 0;
                 if (typeof (options) === 'string') {
                     buf = (options === 'binary') ? new BufferClass(16) : null;
                     options = null;
                 }
                 options = options || {};
                 let rnds = options.random || (options.rng || _rng)();
                 // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
                 rnds[6] = (rnds[6] & 0x0f) | 0x40;
                 rnds[8] = (rnds[8] & 0x3f) | 0x80;
                 // Copy bytes to buffer, if provided
                 if (buf) {
                     for (let ii = 0; ii < 16; ii++) {
                         buf[i + ii] = rnds[ii];
                     }
                 }
-                return buf || unparse(rnds);
+                return buf || _unparse(rnds);
+            }
+            export function Uuid() {
             }
-            // Export public API
+            export namespace Uuid {
-            const empty = "00000000-0000-0000-0000-000000000000";
+                export const v4 = _v4;
+                export const v1 = _v1;
-            interface uuid {
+                export const empty = "00000000-0000-0000-0000-000000000000";
-                (options?, buf?, offset?) : string;
+                export const parse = _parse;
-                v1(options?, buf?, offset?) : string;
+                export const unparse = _unparse;
-                v4(options?, buf?, offset?) : string;
+            }
  No newline at end of file
-                readonly empty: string;
-                parse(s, buf?, offset?) : Array<string>;
-                unparse(buf, offset?) : string;
-            export = <uuid>(() =>{
-                var f : any = function(options?, buf?, offset?) : string {
-                    return v4(options, buf, offset);
-                };
-                f.v1 = v1;
-                f.v4 = v4;
-                f.empty = empty;
-                f.parse = parse;
-                f.unparse = unparse;
-                return f;
-            })();
  No newline at end of file

src/ts/safe.ts +50 -7

             export function argumentNotNull(arg, name) {
                 if (arg === null || arg === undefined)
                     throw new Error("The argument " + name + " can't be null or undefined");
             }
             export function argumentNotEmptyString(arg, name) {
                 if (typeof (arg) !== "string" || !arg.length)
                     throw new Error("The argument '" + name + "' must be a not empty string");
             }
             export function argumentNotEmptyArray(arg, name) {
                 if (!(arg instanceof Array) || !arg.length)
                     throw new Error("The argument '" + name + "' must be a not empty array");
             }
             export function argumentOfType(arg, type, name) {
                 if (!(arg instanceof type))
                     throw new Error("The argument '" + name + "' type doesn't match");
             }
             export function isNull(arg) {
                 return (arg === null || arg === undefined);
             }
             export function isPrimitive(arg) {
                 return (arg === null || arg === undefined || typeof (arg) === "string" ||
                     typeof (arg) === "number" || typeof (arg) === "boolean");
             }
             export function isInteger(arg) {
                 return parseInt(arg) == arg;
             }
             export function isNumber(arg) {
                 return parseFloat(arg) == arg;
             }
             export function isString(val) {
                 return typeof (val) == "string" || val instanceof String;
             }
             export function isNullOrEmptyString(str) {
                 if (str === null || str === undefined ||
                     ((typeof (str) == "string" || str instanceof String) && str.length === 0))
                     return true;
             }
-            export function isNotEmptyArray(arg) {
+            export function isNotEmptyArray(arg): arg is Array<any> {
                 return (arg instanceof Array && arg.length > 0);
             }
             /**
              * Выполняет метод для каждого элемента массива, останавливается, когда
              * либо достигнут конец массива, либо функция <c>cb</c> вернула
              * значение.
              *
              * @param {Array | Object} obj массив элементов для просмотра
              * @param {Function} cb функция, вызываемая для каждого элемента
              * @param {Object} thisArg значение, которое будет передано в качестве
              *                <c>this</c> в <c>cb</c>.
              * @returns Результат вызова функции <c>cb</c>, либо <c>undefined</c>
              *          если достигнут конец массива.
              */
-            export function each(obj, cb, thisArg) {
+            export function each(obj, cb, thisArg?) {
                 argumentNotNull(cb, "cb");
                 var i, x;
                 if (obj instanceof Array) {
                     for (i = 0; i < obj.length; i++) {
                         x = cb.call(thisArg, obj[i], i);
                         if (x !== undefined)
                             return x;
                     }
                 } else {
                     var keys = Object.keys(obj);
                     for (i = 0; i < keys.length; i++) {
                         var k = keys[i];
                         x = cb.call(thisArg, obj[k], k);
                         if (x !== undefined)
                             return x;
                     }
                 }
             }
+            /** Copies property values from a source object to the destination and returns
+             * the destination onject.
+             *
+             * @param dest The destination object into which properties from the source
+             *  object will be copied.
+             * @param source The source of values which will be copied to the destination
+             *  object.
+             * @param template An optional parameter specifies which properties should be
+             *  copied from the source and how to map them to the destination. If the
+             *  template is an array it contains the list of property names to copy from the
+             *  source to the destination. In case of object the templates contains the map
+             *  where keys are property names in the source and the values are property
+             *  names in the destination object. If the template isn't specified then the
+             *  own properties of the source are entirely copied to the destination.
+             *
+             */
+            export function mixin<T,S>(dest: T, source: S, template?: string[] | object) : T & S {
+                argumentNotNull(dest, "to");
+                let _res = <T & S>dest;
+                if (template instanceof Array) {
+                    for(let i = 0; i < template.length; i++) {
+                        let p = template[i];
+                        if (p in source)
+                            _res[p] = source[p];
+                    }
+                } else if (template) {
+                    let keys = Object.keys(source);
+                    for(let i = 0; i < keys.length; i++) {
+                        let p = keys[i];
+                        if (p in template)
+                            _res[template[p]] = source[p];
+                    }
+                } else {
+                    let keys = Object.keys(source);
+                    for(let i = 0; i < keys.length; i++) {
+                        let p = keys[i];
+                        _res[p] = source[p];
+                    }
+                }
+                return _res;
+            }
             /** Wraps the specified function to emulate an asynchronous execution.
              * @param{Object} thisArg [Optional] Object which will be passed as 'this' to the function.
              * @param{Function|String} fn [Required] Function wich will be wrapped.
              */
             export function async(_fn: (...args: any[]) => any, thisArg): (...args: any[]) => PromiseLike<any> {
                 let fn = _fn;
                 if (arguments.length == 2 && !(fn instanceof Function))
                     fn = thisArg[fn];
                 if (fn == null)
                     throw new Error("The function must be specified");
                 function wrapresult(x, e?): PromiseLike<any> {
                     if (e) {
                         return {
                             then: function (cb, eb) {
                                 try {
                                     return eb ? wrapresult(eb(e)) : this;
                                 } catch (e2) {
                                     return wrapresult(null, e2);
                                 }
                             }
                         };
                     } else {
                         if (x && x.then)
                             return x;
                         return {
                             then: function (cb) {
                                 try {
                                     return cb ? wrapresult(cb(x)) : this;
                                 } catch (e2) {
                                     return wrapresult(e2);
                                 }
                             }
                         };
                     }
                 }
                 return function () {
                     try {
                         return wrapresult(fn.apply(thisArg, arguments));
                     } catch (e) {
                         return wrapresult(null, e);
                     }
                 };
             }
-            export function delegate(target, _method: (string | Function)) {
+            export function delegate<T, K extends keyof T>(target: T, _method: (K | Function)) {
-                let method : Function;
+                let method;
                 if (!(_method instanceof Function)) {
                     argumentNotNull(target, "target");
                     method = target[_method];
+                    if (!(method instanceof Function))
+                        throw new Error("'method' argument must be a Function or a method name");
                 } else {
                     method = _method;
                 }
-                if (!(method instanceof Function))
-                    throw new Error("'method' argument must be a Function or a method name");
                 return function () {
                     return method.apply(target, arguments);
                 };
             }
             /**
              * Для каждого элемента массива вызывает указанную функцию и сохраняет
              * возвращенное значение в массиве результатов.
              *
              * @remarks cb может выполняться асинхронно, при этом одновременно будет
              *          только одна операция.
              *
              * @async
              */
             export function pmap(items, cb) {
                 argumentNotNull(cb, "cb");
                 if (items && items.then instanceof Function)
                     return items.then(function (data) {
                         return pmap(data, cb);
                     });
                 if (isNull(items) || !items.length)
                     return items;
                 var i = 0,
                     result = [];
                 function next() {
                     var r, ri;
                     function chain(x) {
                         result[ri] = x;
                         return next();
                     }
                     while (i < items.length) {
                         r = cb(items[i], i);
                         ri = i;
                         i++;
                         if (r && r.then) {
                             return r.then(chain);
                         } else {
                             result[ri] = r;
                         }
                     }
                     return result;
                 }
                 return next();
             }
             /**
              * Выбирает первый элемент из последовательности, или обещания, если в
              * качестве параметра используется обещание, оно должно вернуть массив.
              *
              * @param {Function} cb обработчик результата, ему будет передан первый
              *                  элемент последовательности в случае успеха
              * @param {Function} err обработчик исключения, если массив пустой, либо
              *                  не массив
              *
              * @remarks Если не указаны ни cb ни err, тогда функция вернет либо
              *          обещание, либо первый элемент.
              * @async
              */
             export function first(sequence: any, cb: Function, err: Function) {
                 if (sequence) {
                     if (sequence.then instanceof Function) {
                         return sequence.then(function (res) {
                             return first(res, cb, err);
                         }, err);
                     } else if (sequence && "length" in sequence) {
                         if (sequence.length === 0) {
                             if (err)
                                 return err(new Error("The sequence is empty"));
                             else
                                 throw new Error("The sequence is empty");
                         }
                         return cb ? cb(sequence[0]) : sequence[0];
                     }
                 }
                 if (err)
                     return err(new Error("The sequence is required"));
                 else
                     throw new Error("The sequence is required");
             }
             export function destroy(d: any) {
                 if (d && 'destroy' in d)
                     d.destroy();
             }

src/js/Deferred.js removed 0 -3

NO CONTENT: file was removed

src/js/declare.js removed 0 -6

NO CONTENT: file was removed

tsc.json removed 0 -15

NO CONTENT: file was removed

tsc.test.json removed 0 -15

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