implab/implabjs-core Commit - r102:32db28d9ca07

Merge with ts-plugin

cin -

r102:32db28d9ca07 v1.3.2 default

parent child

Context file:

r102:32db28d9ca07

Expand 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 implabjs-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>

.vscode/launch.json created 644 +14 0

@@ -0,0 +1,14
	1	{
	2	"version": "0.2.0",
	3	"configurations": [
	4	{
	5	"name": "Launch browser tests",
	6	"type": "node",
	7	"request": "launch",
	8	"program": "${workspaceFolder}/build/test/tests/index.js",
	9	"cwd": "${workspaceFolder}/build/test",
	10	"sourceMaps": true,
	11	"preLaunchTask": "Build browser test"
	12	}
	13	]
	14	} No newline at end of file

.vscode/tasks.json created 644 +15 0

@@ -0,0 +1,15
	1	{
	2	"version": "2.0.0",
	3	"command": "./gradlew",
	4	"type": "shell",
	5	"tasks": [
	6	{
	7	"label": "Build browser test",
	8	"args": [
	9	"assembleTest",
	10	"-Psymbols=local",
	11	"-Pflavour=browser"
	12	]
	13	}
	14	]
	15	} No newline at end of file

buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy created 644 +32 0

@@ -0,0 +1,32
	1	package org.implab.gradle.hg;
	2
	3	import org.gradle.api.Plugin;
	4	import org.gradle.api.Project;
	5
	6	public class MercurialPlugin implements Plugin<Project> {
	7	public void apply(Project project) {
	8	if (!project.version) {
	9
	10	def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
	11
	12	def tagVersion;
	13	def tagDistance;
	14
	15	def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
	16
	17	if (match.size()) {
	18	tagVersion = match[0][1];
	19	tagDistance = match[0][2].toInteger();
	20	} else {
	21	throw new Exception("A version must be specied");
	22	}
	23
	24	project.version = tagVersion;
	25
	26	if (tagDistance > 0)
	27	project.version++;
	28	} else {
	29	println "explicit version: $project.version";
	30	}
	31	}
	32	} No newline at end of file

buildSrc/src/main/resources/META-INF/gradle-plugins/org.implab.gradle-hg.properties created 644 +1 0

	@@ -0,0 +1,1
				1	implementation-class=org.implab.gradle.hg.MercurialPlugin No newline at end of file

src/test/ts/tests/ActivatableTests.ts created 644 +54 0

@@ -0,0 +1,54
	1	import { MockActivationController } from "../mock/MockActivationController";
	2	import { SimpleActivatable } from "../mock/SimpleActivatable";
	3	import { test } from "./TestTraits";
	4
	5	test("simple activation", async t => {
	6
	7	const a = new SimpleActivatable();
	8	t.false(a.isActive());
	9
	10	await a.activate();
	11	t.true(a.isActive());
	12
	13	await a.deactivate();
	14	t.false(a.isActive());
	15	});
	16
	17	test("controller activation", async t => {
	18
	19	const a = new SimpleActivatable();
	20	const c = new MockActivationController();
	21
	22	t.false(a.isActive(), "the component is not active by default");
	23	t.assert(c.getActive() == null, "the activation controller doesn't have an active component by default");
	24	t.assert(a.getActivationController() == null, "the component doesn't have an activation controller by default");
	25
	26	t.comment("Active the component through the controller");
	27	await c.activate(a);
	28	t.true(a.isActive(), "The component should successfully activate");
	29	t.equal(c.getActive(), a, "The controller should point to the activated component");
	30	t.equal(a.getActivationController(), c, "The component should point to the controller");
	31
	32	t.comment("Deactive the component throug the controller");
	33	await c.deactivate();
	34
	35	t.false(a.isActive(), "The component should successfully deactivate");
	36	t.equal(c.getActive(), null, "The controller shouldn't point to any component");
	37	t.equal(a.getActivationController(), c, "The componet should point to it's controller");
	38	});
	39
	40	test("handle error in onActivating", async t => {
	41	const a = new SimpleActivatable();
	42
	43	a.onActivating = async () => {
	44	throw new Error("Should fail");
	45	};
	46
	47	try {
	48	await a.activate();
	49	t.fail("activation should fail");
	50	} catch {
	51	}
	52
	53	t.false(a.isActive(), "the component should remain inactive");
	54	});

src/test/ts/tests/CancellationTests.ts created 644 +88 0

@@ -0,0 +1,88
	1	import { Cancellation } from "../Cancellation";
	2	import { delay } from "../safe";
	3	import { test } from "./TestTraits";
	4
	5	test("standalone cancellation", async t => {
	6
	7	let doCancel: (e) => void;
	8
	9	const ct = new Cancellation(cancel => {
	10	doCancel = cancel;
	11	});
	12
	13	let counter = 0;
	14	const reason = "BILL";
	15
	16	t.true(ct.isSupported(), "Cancellation must be supported");
	17	t.false(ct.isRequested(), "Cancellation shouldn't be requested");
	18	ct.throwIfRequested();
	19	t.pass("The exception shouldn't be thrown unless the cancellation is requested");
	20
	21	ct.register(() => counter++);
	22	t.equals(counter, 0, "counter should be zero");
	23
	24	ct.register(() => counter++).destroy();
	25
	26	doCancel(reason);
	27
	28	t.true(ct.isRequested(), "Cancellation should be requested");
	29	t.equals(counter, 1, "The registered callback should be triggered");
	30
	31	ct.register(() => counter++);
	32	t.equals(counter, 2, "The callback should be triggered immediately");
	33
	34	let msg;
	35	ct.register(e => msg = e);
	36	t.equals(msg, reason, "The cancellation reason should be passed to callback");
	37
	38	try {
	39	msg = null;
	40	ct.throwIfRequested();
	41	t.fail("The exception should be thrown");
	42	} catch (e) {
	43	msg = e;
	44	}
	45	t.equals(msg, reason, "The cancellation reason should be catched");
	46	});
	47
	48	test("async cancellation", async t => {
	49
	50	const ct = new Cancellation(cancel => {
	51	cancel("STOP!");
	52	});
	53
	54	try {
	55	await delay(0, ct);
	56	t.fail("Should thow the exception");
	57	} catch (e) {
	58	t.equals(e, "STOP!", "Should throw the cancellation reason");
	59	}
	60	});
	61
	62	test("cancel with external event", async t => {
	63	const ct = new Cancellation(cancel => {
	64	setTimeout(x => cancel("STOP!"), 0);
	65	});
	66
	67	try {
	68	await delay(10000, ct);
	69	t.fail("Should thow the exception");
	70	} catch (e) {
	71	t.equals(e, "STOP!", "Should throw the cancellation reason");
	72	}
	73	});
	74
	75	test("operation normal flow", async t => {
	76
	77	let htimeout;
	78	const ct = new Cancellation(cancel => {
	79	htimeout = setTimeout(() => cancel("STOP!"), 1000);
	80	});
	81
	82	try {
	83	await delay(0, ct);
	84	t.pass("Should pass");
	85	} finally {
	86	clearTimeout(htimeout);
	87	}
	88	});

src/test/ts/tests/ContainerTests.ts created 644 +93 0

@@ -0,0 +1,93
	1	import { test } from "./TestTraits";
	2	import { Container } from "../di/Container";
	3	import { ReferenceDescriptor } from "../di/ReferenceDescriptor";
	4	import { AggregateDescriptor } from "../di/AggregateDescriptor";
	5	import { ValueDescriptor } from "../di/ValueDescriptor";
	6	import { Foo } from "../mock/Foo";
	7	import { Bar } from "../mock/Bar";
	8	import { isNull } from "../safe";
	9
	10	test("Container register/resolve tests", async t => {
	11	const container = new Container();
	12
	13	const connection1 = "db://localhost";
	14
	15	t.throws(
	16	() => container.register("bla-bla", "bla-bla"),
	17	"Do not allow to register anything other than descriptors"
	18	);
	19
	20	t.doesNotThrow(
	21	() => container.register("connection", new ValueDescriptor(connection1)),
	22	"register ValueDescriptor"
	23	);
	24
	25	t.equals(container.resolve("connection"), connection1, "resolve string value");
	26
	27	t.doesNotThrow(
	28	() => container.register(
	29	"dbParams",
	30	new AggregateDescriptor({
	31	timeout: 10,
	32	connection: new ReferenceDescriptor({ name: "connection" })
	33	})
	34	),
	35	"register AggregateDescriptor"
	36	);
	37
	38	const dbParams = container.resolve("dbParams");
	39	t.equals(dbParams.connection, connection1, "should get string value 'dbParams.connection'");
	40	});
	41
	42	test("Container configure/resolve tests", async t => {
	43
	44	const container = new Container();
	45
	46	await container.configure({
	47	foo: {
	48	$type: Foo
	49	},
	50
	51	box: {
	52	$type: Bar,
	53	params: {
	54	$dependency: "foo"
	55	}
	56	},
	57
	58	bar: {
	59	$type: Bar,
	60	params: {
	61	db: {
	62	provider: {
	63	$dependency: "db"
	64	}
	65	}
	66	}
	67	}
	68	});
	69	t.pass("should configure from js object");
	70
	71	const f1 = container.resolve("foo");
	72
	73	t.assert(!isNull(f1), "foo should be not null");
	74
	75	t.throws(() => container.resolve("bar"), "should not resolve dependency 'db'");
	76
	77	});
	78
	79	test("Load configuration from module", async t => {
	80	const container = new Container();
	81
	82	await container.configure("../mock/config1", { contextRequire: require });
	83	t.pass("The configuration should load");
	84
	85	const f1 = container.resolve("foo");
	86
	87	t.assert(!isNull(f1), "foo should be not null");
	88
	89	const b1 = container.resolve("bar") as Bar;
	90
	91	t.assert(!isNull(b1), "bar should not be null");
	92	t.assert(!isNull(b1.foo), "bar.foo should not be null");
	93	});

src/test/ts/tests/ObservableTests.ts created 644 +69 0

@@ -0,0 +1,69
	1	import { TraceSource } from "../log/TraceSource";
	2	import { Observable } from "../Observable";
	3	import { IObservable } from "../interfaces";
	4	import { delay } from "../safe";
	5	import { test } from "./TestTraits";
	6
	7	const trace = TraceSource.get("ObservableTests");
	8
	9	test("events sequence example", async t => {
	10
	11	let events: IObservable<number>;
	12
	13	const done = new Promise<void>(resolve => {
	14	events = new Observable<number>(async (notify, fail, finish) => {
	15	for (let i = 0; i < 10; i++) {
	16	await delay(0);
	17	notify(i);
	18	}
	19	finish();
	20	resolve();
	21	});
	22	});
	23
	24	let count = 0;
	25	let complete = false;
	26	events.on(x => count = count + x, null, () => complete = true);
	27
	28	const first = await events.next();
	29
	30	t.equals(first, 0, "the first event");
	31	t.false(complete, "the sequence is not complete");
	32
	33	await done;
	34
	35	t.equals(count, 45, "the summ of the evetns");
	36	t.true(complete, "the sequence is complete");
	37	});
	38
	39	test("event sequence termination", async t => {
	40	let events: IObservable<number>;
	41
	42	const done = new Promise<void>(resolve => {
	43	events = new Observable<number>(async (notify, fail, complete) => {
	44	await delay(0);
	45	notify(1);
	46	complete();
	47	notify(2);
	48	complete();
	49	fail("Sequence terminated");
	50	resolve();
	51	});
	52	});
	53
	54	let count = 0;
	55	events.on(() => {}, e => count++, () => count++);
	56
	57	const first = await events.next();
	58	t.equals(first, 1, "the first message");
	59	try {
	60	await events.next();
	61	t.fail("shoud throw an exception");
	62	} catch (e) {
	63	t.pass("the sequence is terminated");
	64	}
	65
	66	await done;
	67
	68	t.equals(count, 1, "the sequence must be terminated once");
	69	});

src/test/ts/tests/SafeTests.ts created 644 +95 0

@@ -0,0 +1,95
	1	import { Cancellation } from "../Cancellation";
	2	import { first, isPromise, firstWhere, delay, nowait } from "../safe";
	3	import { test } from "./TestTraits";
	4
	5	test("await delay test", async t => {
	6	// schedule delay
	7	let resolved = false;
	8	let res = delay(0).then(() => resolved = true);
	9
	10	t.false(resolved, "the delay should be async");
	11
	12	await res;
	13	t.pass("await delay");
	14
	15	// create cancellation token
	16	let cancel: (e?: any) => void;
	17	const ct = new Cancellation(c => cancel = c);
	18
	19	// schedule delay
	20	resolved = false;
	21	res = delay(0, ct).then(() => resolved = true);
	22
	23	t.false(resolved, "created delay with ct");
	24
	25	// cancel
	26	cancel();
	27
	28	try {
	29	await res;
	30	t.fail("the delay should fail when it is cancelled");
	31	} catch {
	32	t.pass("the delay is cancelled");
	33	}
	34
	35	t.throws(() => {
	36	// try schedule delay after the cancellation is requested
	37	nowait(delay(0, ct));
	38	}, "Should throw if cancelled before start");
	39	});
	40
	41	test("sequemce test", async t => {
	42	const sequence = ["a", "b", "c"];
	43	const empty = [];
	44
	45	// synchronous tests
	46	t.equals(first(sequence), "a", "Should return the first element");
	47	t.equals(firstWhere(sequence, x => x === "b"), "b", "Should get the second element");
	48
	49	let v: string;
	50	let e: Error;
	51	first(sequence, x => v = x);
	52	t.equal(v, "a", "The callback should be called for the first element");
	53	firstWhere(sequence, x => x === "b", x => v = x);
	54	t.equal(v, "b", "The callback should be called for the second element");
	55
	56	t.throws(() => {
	57	first(empty);
	58	}, "Should throw when the sequence is empty");
	59
	60	t.throws(() => {
	61	firstWhere(empty, x => x === "b");
	62	}, "Should throw when the sequence is empty");
	63
	64	t.throws(() => {
	65	first(empty, x => v = x);
	66	}, "Should throw when the sequence is empty");
	67
	68	t.throws(() => {
	69	firstWhere(empty, x => x === "b", x => v = x);
	70	}, "Should throw when the sequence is empty");
	71
	72	t.throws(() => {
	73	firstWhere(sequence, x => x === "z");
	74	}, "Should throw when the element isn't found");
	75
	76	t.throws(() => {
	77	firstWhere(sequence, x => x === "z", x => v = x);
	78	}, "Should throw when the element isn't found");
	79
	80	first(empty, null, x => e = x);
	81	t.true(e, "The errorback should be called for the empty sequence");
	82
	83	// async tests
	84	const asyncSequence = Promise.resolve(sequence);
	85	const asyncEmptySequence = Promise.resolve(empty);
	86
	87	const promise = first(asyncSequence);
	88	t.true(isPromise(promise), "Should return promise");
	89
	90	v = await promise;
	91	t.equal(v, "a", "Should return the first element");
	92
	93	v = await new Promise(resolve => first(asyncSequence, resolve));
	94	t.equal(v, "a", "The callback should be called for the first element");
	95	});

src/test/ts/tests/TestTraits.ts created 644 +74 0

@@ -0,0 +1,74
	1	import { IObservable, ICancellation, IDestroyable } from "../interfaces";
	2	import { Cancellation } from "../Cancellation";
	3	import { TraceEvent, LogLevel, WarnLevel, DebugLevel, TraceSource } from "../log/TraceSource";
	4	import * as tape from "tape";
	5	import { argumentNotNull, destroy } from "../safe";
	6
	7	export class TapeWriter implements IDestroyable {
	8	private readonly _tape: tape.Test;
	9
	10	private readonly _subscriptions = new Array<IDestroyable>();
	11	private _destroyed;
	12
	13	constructor(t: tape.Test) {
	14	argumentNotNull(t, "tape");
	15	this._tape = t;
	16	}
	17
	18	writeEvents(source: IObservable<TraceEvent>, ct: ICancellation = Cancellation.none) {
	19	if (!this._destroyed) {
	20	const subscription = source.on(this.writeEvent.bind(this));
	21	if (ct.isSupported()) {
	22	ct.register(subscription.destroy.bind(subscription));
	23	}
	24	this._subscriptions.push(subscription);
	25	}
	26	}
	27
	28	writeEvent(next: TraceEvent) {
	29	if (next.level >= DebugLevel) {
	30	this._tape.comment(`DEBUG ${next.source.id} ${next}`);
	31	} else if (next.level >= LogLevel) {
	32	this._tape.comment(`LOG ${next.source.id} ${next}`);
	33	} else if (next.level >= WarnLevel) {
	34	this._tape.comment(`WARN ${next.source.id} ${next}`);
	35	} else {
	36	this._tape.comment(`ERROR ${next.source.id} ${next}`);
	37	}
	38	}
	39
	40	destroy() {
	41	this._subscriptions.forEach(destroy);
	42	}
	43	}
	44
	45	export function test(name: string, cb: (t: tape.Test, trace: TraceSource) => any) {
	46	tape(name, async t => {
	47	const writer = new TapeWriter(t);
	48
	49	// this trace is not announced through the TraceSource global registry
	50	const trace = new TraceSource(name);
	51	trace.level = DebugLevel;
	52	writer.writeEvents(trace.events);
	53
	54	const h = TraceSource.on(ts => {
	55	ts.level = DebugLevel;
	56	writer.writeEvents(ts.events);
	57	});
	58
	59	try {
	60	await cb(t, trace);
	61	} catch (e) {
	62
	63	// verbose error information
	64	// tslint:disable-next-line
	65	console.error(e);
	66	t.fail(e);
	67
	68	} finally {
	69	t.end();
	70	destroy(writer);
	71	destroy(h);
	72	}
	73	});
	74	}

src/test/ts/tests/TextTests.ts created 644 +86 0

@@ -0,0 +1,86
	1	import { StringBuilder } from "../text/StringBuilder";
	2	import { test } from "./TestTraits";
	3	import { MockConsole } from "../mock/MockConsole";
	4	import { ConsoleWriter } from "../log/ConsoleWriter";
	5
	6	test("String builder", async t => {
	7	const sb = new StringBuilder();
	8
	9	sb.write("hello");
	10	t.equals(sb.toString(), "hello", "Write simple text");
	11
	12	sb.write(", ");
	13	sb.write("world!");
	14	t.equals(sb.toString(), "hello, world!", "Append text");
	15
	16	sb.clear();
	17	t.equals(sb.toString(), "", "Clear");
	18
	19	sb.write(1);
	20	t.equals(sb.toString(), "1", "Write number");
	21
	22	sb.clear();
	23	sb.writeValue(0.123);
	24	t.equals(sb.toString(), "0.123", "Format number");
	25
	26	sb.clear();
	27	sb.writeValue(new Date("2019-01-02T00:00:00.000Z"));
	28	t.equals(sb.toString(), "2019-01-02T00:00:00.000Z", "Format date (ISO)");
	29
	30	sb.clear();
	31	sb.write("{0}", "hello");
	32	t.equals(sb.toString(), "hello", "Simple format text");
	33
	34	sb.write(", {0}!", "world");
	35	t.equals(sb.toString(), "hello, world!", "Append formatted text");
	36
	37	sb.clear();
	38	sb.write("abc: {0:json}; {0.length}; {0.1} {{olo}}", ["a", "b", "c"]);
	39	t.equals(sb.toString(), 'abc: [\n "a",\n "b",\n "c"\n]; 3; b {olo}', "Format string with spec");
	40
	41	sb.clear();
	42	t.throws(() => sb.write("}", 0), "Should die on bad format: '}'");
	43	t.throws(() => sb.write("{", 0), "Should die on bad format: '{'");
	44	t.throws(() => sb.write("{}", 0), "Should die on bad format: '{}'");
	45	t.throws(() => sb.write("{:}", 0), "Should die on bad format: '{:}'");
	46	t.throws(() => sb.write("{{0}", 0), "Should die on bad format: '{{0}'");
	47
	48	});
	49
	50	test("ConsoleWriter", t => {
	51	const mockConsole = new MockConsole();
	52	const writer = new ConsoleWriter(mockConsole);
	53
	54	writer.setLogLevel("log");
	55
	56	writer.writeLine("Hello, world!");
	57
	58	t.equals(mockConsole.getBuffer().length, 1, "One line should be written");
	59	t.equals(mockConsole.getBuffer()[0].level, "log", "LogLevel should be 'log'");
	60	t.deepEqual(mockConsole.getBuffer()[0].data, ["Hello, world!"], "The buffer should contain single string");
	61
	62	mockConsole.clear();
	63	writer.setLogLevel("debug");
	64	writer.write("Bring ");
	65	writer.write("the {0}!", "light");
	66	t.equals(mockConsole.getBuffer().length, 0, "No line should be written");
	67	writer.writeLine();
	68
	69	t.equals(mockConsole.getBuffer().length, 1, "One line should be written");
	70	t.equals(mockConsole.getBuffer()[0].level, "debug", "LogLevel should be 'log'");
	71	t.deepEqual(mockConsole.getBuffer()[0].data, ["Bring the light!"], "Should concatenate string parts together");
	72
	73	mockConsole.clear();
	74	writer.writeLine("It's {0} o'clock, lets have some {1}!", { h: 5}, { title: "tee" });
	75
	76	t.deepEqual(mockConsole.getBuffer()[0].data, ["It's ", { h: 5}, " o'clock, lets have some ", { title: "tee" }, "!"], "Non string parts should be psassed as is");
	77
	78	mockConsole.clear();
	79	writer.writeLine("{0} or {1} to {2}", {i: 25}, 6, 4);
	80	t.deepEqual(mockConsole.getBuffer()[0].data, [{i: 25}, " or 6 to 4"], "25 or 6 to 4");
	81
	82	mockConsole.clear();
	83	writer.writeLine("{0} or {1} to {2}! Let's have some {3}", 25, 6, 4, { product: "tee" } );
	84	t.deepEqual(mockConsole.getBuffer()[0].data, ["25 or 6 to 4! Let's have some ", { product: "tee" }], "Should handle many text chunks and object at the end");
	85
	86	});

src/test/ts/tests/TraceSourceTests.ts created 644 +89 0

@@ -0,0 +1,89
	1	import { TraceSource, DebugLevel } from "../log/TraceSource";
	2	import * as tape from "tape";
	3	import { TapeWriter, test } from "./TestTraits";
	4	import { MockConsole } from "../mock/MockConsole";
	5	import { ConsoleLogger } from "../log/writers/ConsoleLogger";
	6	import { ConsoleWriter } from "../log/ConsoleWriter";
	7
	8	const sourceId = "test/TraceSourceTests";
	9
	10	tape("trace message", t => {
	11	const trace = TraceSource.get(sourceId);
	12
	13	trace.level = DebugLevel;
	14
	15	const h = trace.events.on(ev => {
	16	t.equal(ev.source, trace, "sender should be the current trace source");
	17	t.equal(ev.level, DebugLevel, "level should be debug level");
	18	t.equal(ev.toString(), "Hello, World!", "The message should be a formatted message");
	19
	20	t.end();
	21	});
	22
	23	trace.debug("Hello, {0}!", "World");
	24
	25	h.destroy();
	26	});
	27
	28	tape("trace event", t => {
	29	const trace = TraceSource.get(sourceId);
	30
	31	trace.level = DebugLevel;
	32
	33	const event = {
	34	name: "custom event"
	35	};
	36
	37	const h = trace.events.on(ev => {
	38	t.equal(ev.source, trace, "sender should be the current trace source");
	39	t.equal(ev.level, DebugLevel, "level should be debug level");
	40	t.equal(ev.message, event, "The message should be the specified object");
	41
	42	t.end();
	43	});
	44
	45	trace.traceEvent(DebugLevel, event);
	46
	47	h.destroy();
	48	});
	49
	50	tape("tape comment writer", async t => {
	51	const writer = new TapeWriter(t);
	52
	53	TraceSource.on(ts => {
	54	writer.writeEvents(ts.events);
	55	});
	56
	57	const trace = TraceSource.get(sourceId);
	58	trace.level = DebugLevel;
	59
	60	trace.log("Hello, {0}!", "World");
	61	trace.log("Multi\n line");
	62	trace.warn("Look at me!");
	63	trace.error("DIE!");
	64
	65	writer.destroy();
	66
	67	trace.log("You shouldn't see it!");
	68
	69	t.comment("DONE");
	70
	71	t.end();
	72	});
	73
	74	test("console writer", (t, trace) => {
	75
	76	const mockConsole = new MockConsole();
	77	const writer = new ConsoleWriter(mockConsole);
	78	const consoleLog = new ConsoleLogger(writer);
	79	consoleLog.writeEvents(trace.events);
	80
	81	trace.log("Hello, world!");
	82	t.deepEqual(mockConsole.getLine(0), ["console writer: Hello, world!"], "Log one string");
	83
	84	trace.log({ foo: "bar" });
	85	t.deepEqual(mockConsole.getLine(1), ["console writer: ", { foo: "bar" }], "Log an object");
	86
	87	trace.log("json: {0:json}", { foo: "bar" });
	88	t.deepEqual(mockConsole.getLine(2), ['console writer: json: {\n "foo": "bar"\n}'], "should convert to string substitutions with spec");
	89	});

src/test/ts/tests/dummy.ts created 644 +13 0

@@ -0,0 +1,13
	1	import * as tape from "tape";
	2	import { Uuid } from "../Uuid";
	3
	4	tape("simple", t => {
	5	t.pass("sync assert");
	6	setTimeout(() => {
	7	t.pass("async assert");
	8	t.comment(Uuid());
	9	t.ok(Uuid() !== Uuid());
	10	// end should be called after the last assertion
	11	t.end();
	12	}, 100);
	13	});

src/testAmd/js/tests/example.js created 644 +7 0

@@ -0,0 +1,7
	1	define(["tape", "../Uuid"], function(tape, Uuid) {
	2	"use strict";
	3	tape('uuid', function(t) {
	4	t.notEqual(Uuid(),Uuid());
	5	t.end();
	6	});
	7	}); No newline at end of file

src/testAmd/js/tests/index.js created 644 +9 0

@@ -0,0 +1,9
	1	var rjs = require('requirejs');
	2
	3	rjs.config({
	4	baseUrl: '.',
	5	nodeRequire: require
	6	});
	7
	8
	9	rjs(['./tests/plan']); No newline at end of file

src/testAmd/js/tests/plan.js created 644 +10 0

@@ -0,0 +1,10
	1	define([
	2	"./ActivatableTests",
	3	"./trace-test",
	4	"./TraceSourceTests",
	5	"./CancellationTests",
	6	"./ObservableTests",
	7	"./ContainerTests",
	8	"./SafeTests",
	9	"./TextTests"
	10	]); No newline at end of file

src/testAmd/js/tests/trace-test.js created 644 +30 0

@@ -0,0 +1,30
	1	define(["require", "tape"], function(require, tape) {
	2	"use strict";
	3	var sourceId = '73a633f3-eab8-49b0-8601-07cae710f234';
	4	var sourceId2 = '3ba9c7cd-ed77-437b-9a2f-1cbeb1226b5b';
	5	tape('Load TraceSource for the module', function(t) {
	6	require(["../log/trace!" + sourceId, "../log/TraceSource"], function(trace, TraceSource_1) {
	7	var TraceSource = TraceSource_1.TraceSource;
	8	t.equal(trace && trace.id, sourceId, "trace should be taken from the loader plugin parameter");
	9
	10	var count = 0;
	11
	12	var h = TraceSource.on(function(x) {
	13	if(x.id == sourceId \|\| x.id == sourceId2)
	14	count++;
	15	});
	16
	17	t.equal(count, 1, "should see created channel immediatelly");
	18	t.equal(trace, TraceSource.get(sourceId), "should get same TraceSource from registry");
	19	t.equal(count, 1);
	20
	21	TraceSource.get(sourceId2);
	22
	23	t.equal(count, 2);
	24
	25	h.destroy();
	26
	27	t.end();
	28	});
	29	});
	30	}); No newline at end of file

src/testCjs/ts/tests/index.ts created 644 +1 0

	@@ -0,0 +1,1
				1	import "./plan";

src/testCjs/ts/tests/plan.ts created 644 +7 0

@@ -0,0 +1,7
	1	import "./ActivatableTests";
	2	import "./TraceSourceTests";
	3	import "./CancellationTests";
	4	import "./ObservableTests";
	5	import "./ContainerTests";
	6	import "./SafeTests";
	7	import "./TextTests";

.eslintrc.json +1 -1

                     "ecmaFeatures": {
                         "jsx": true
                     },
-                    "sourceType": "module"
+                    "sourceType": "script"
                 },
                 "extends": "eslint:recommended",
                 "rules": {

.hgignore +1 0

             build/
             node_modules/
             src/typings/
+            ivy-repo/

.vscode/settings.json +7 -1

@@ -11,5 +11,11
11	"/node_modules/": true,	11	"/node_modules/": true,
12	"/build": true	12	"/build": true
13	},	13	},
14	"editor.minimap.enabled": false	14	"editor.minimap.enabled": false,
		15	"files.exclude": {
		16	"**/.classpath": true,
		17	"**/.project": true,
		18	"**/.settings": true,
		19	"**/.factorypath": true
		20	}
15	} No newline at end of file	21	}

build.gradle +193 -227

@@ -1,278 +1,244
1	// если версия явно не заданы вычисляем ее из тэга ревизии v.{num}***	1	plugins {
2	// результатом будет версия '{num}.{distance}' где distance - расстояние от	2	id "org.implab.gradle-typescript" version "1.1.1"
3	// текущей ревизии до ревизии с тэгом	3	id "org.implab.gradle-hg"
4	def tagDistance = 0;	4	id "ivy-publish"
5	def isRelease = false;	5	}
6
7	if (!version) {
8
9	def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
10		6
11	def tagVersion;	7	if (!symbols in ['local', 'pack', 'none'])
12		8	throw new Exception("The symbols property value is invalid: $symbols");
13	def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
14		9
15	if (match.size()) {	10	if (!flavour in ['browser', 'node'])
16	tagVersion = match[0][1];	11	throw new Exception("The flavour property value is invalid: $flavour");
17	tagDistance = match[0][2].toInteger();	12
18	} else {	13	ext {
19	throw new Exception("A version must be specied");	14	packageName = flavour == 'browser' ? "@$npmScope/$name-amd" : "@$npmScope/$name"
		15	lint = project.hasProperty('lint') ? project.lint ?: true : false
20	}	16	}
21		17
22	version = tagVersion;	18	sources {
23		19	amd {
24	if (tagDistance > 0)	20	typings {
25	version++;	21	srcDir main.output.typingsDir
26	} else {	22	}
27	println "explicit version: $version";
28	}	23	}
29		24
30	if (hasProperty('versionSuffix') && versionSuffix) {	25	cjs {
31	version += "-$versionSuffix"	26	typings {
		27	srcDir main.output.typingsDir
		28	}
32	}	29	}
33		30
34	if(!npmName)	31	testAmd {
35	npmName = name;	32	typings {
36		33	srcDir main.output.typingsDir
37	if (hasProperty('release')) {	34	srcDir amd.output.typingsDir
38	isRelease = (release != 'false')	35	srcDir test.output.typingsDir
39	} else {	36	}
40	isRelease = (tagDistance == 0);
41	}	37	}
42		38
43	if(!["amd", "commonjs", "system", "umd", "es6", "esnext"].contains(jsmodule))	39	testCjs {
44	throw new Exception("Invalid jsmodule specified: $jsmodule");	40	typings {
45	if(!["es3", "es5", "es6", "es2016", "es2017", "esnext"].contains(target))	41	srcDir main.output.typingsDir
46	throw new Exception("Invalid target specified: $target")	42	srcDir cjs.output.typingsDir
47		43	srcDir test.output.typingsDir
48	def targetLibs = [	44	}
49	"es3" : "es5,es2015.promise,es2015.symbol,dom,scripthost",	45	}
50	"es5" : "es5,es2015.promise,es2015.symbol,dom,scripthost"
51	];
52
53	ext.packageName="@$npmScope/$npmName";
54
55	def srcDir = "$projectDir/src"
56	def typingsDir = "$srcDir/typings"
57	def distDir = "$buildDir/dist"
58	def testDir = "$buildDir/test"
59	def lib = targetLibs[target] ?: "${target},dom";
60
61	println "lib: $lib";
62
63	def sourceSets = ["main", "amd", "cjs"];
64	def testSets = ["test", "testAmd", "testCjs"];
65
66	task beforeBuild {
67	}	46	}
68		47
69	def createSoursetTasks = { String name, String outDir ->	48	typescript {
70	def setName = name.capitalize();	49	compilerOptions {
		50	types = []
		51	declaration = true
71		52
72	def compileDir = "$buildDir/compile/$name"	53	if(symbols != 'none') {
73	def declDir = "$typingsDir/$name"	54	sourceMap = true
74	def setDir = "$projectDir/src/$name"	55	sourceRoot = "_src"
75	def jsDir = outDir;
76
77	def beforeBuildTask = task "beforeBuild$setName"(dependsOn: beforeBuild) {
78	}
79
80	def copyJsTask = task "copyJs$setName"(dependsOn: beforeBuildTask, type: Copy) {
81	from "$setDir/js"
82	into jsDir
83	}	56	}
84		57
85	def lintJsTask = task "lintJs$setName"(dependsOn: beforeBuildTask, type: Exec) {	58	if (flavour == 'node') {
86	inputs.dir("$setDir/js/").skipWhenEmpty();	59	module = "commonjs"
87	commandLine "eslint", '--format', 'stylish', "$setDir/js/"	60	target = "es2017"
		61	lib = ["es2017", "dom", "scripthost"]
		62	} else if (flavour == 'browser') {
		63	module = "amd"
		64	target = "es5"
		65	lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable" ]
		66	}
		67	}
		68	tscCmd = "$projectDir/node_modules/.bin/tsc"
		69	tsLintCmd = "$projectDir/node_modules/.bin/tslint"
		70	esLintCmd = "$projectDir/node_modules/.bin/eslint"
88	}	71	}
89		72
90	def compileTsTask = task "compileTs$setName"(dependsOn: beforeBuildTask, type: Exec) {	73	npm {
91	inputs.dir("$setDir/ts").skipWhenEmpty()	74	npmCmd = "npm"
92	inputs.file("$srcDir/tsconfig.json")
93	inputs.file("$setDir/tsconfig.json")
94	outputs.dir(compileDir)
95	outputs.dir(declDir)
96
97	commandLine 'node_modules/.bin/tsc',
98	'-p', "$setDir/tsconfig.json",
99	'-t', target,
100	'-m', jsmodule,
101	'-d',
102	'--sourceMap',
103	'--sourceRoot', "file://$setDir/ts",
104	'--outDir', compileDir,
105	'--declarationDir', declDir
106
107	if (lib)
108	args '--lib', lib
109	}	75	}
110		76
111	def copyTsOutputTask = task "copyTsOutput$setName"(dependsOn: compileTsTask, type: Copy) {	77	tasks.matching{ it.name =~ /^lint/ }.configureEach {
112	from compileDir	78	onlyIf { lint }
113	into jsDir
114	}
115
116	def copyTypingsTask = task "copyTypings$setName"(dependsOn: compileTsTask, type: Copy) {
117	from declDir
118	into jsDir
119	}	79	}
120		80
121	def copyResourcesTask = task "copyResources$setName"(dependsOn: beforeBuildTask, type: Copy) {	81	if (symbols == 'local') {
122	from "$setDir/resources"	82	tasks.matching{ it.name =~ /^configureTs/ }.configureEach {
123	into outDir	83	compilerOptions {
		84	sourceRoot = "file://" + it.rootDir
124	}	85	}
125
126	task "build$setName" {
127	dependsOn copyTypingsTask,
128	copyTsOutputTask,
129	copyJsTask,
130	copyResourcesTask,
131	lintJsTask
132	}	86	}
133	}	87	}
134		88
135	task printVersion {	89	task printVersion {
136	doLast {	90	doLast {
		91	println "packageName: $packageName";
137	println "version: $version";	92	println "version: $version";
138	println "isRelease: $isRelease, tagDistance: $tagDistance";	93	println "flavour: $flavour";
139	println "packageName: $packageName";	94	println "target: $typescript.compilerOptions.target";
140	println "~~bundle: ${pack.outputs.files.join(',')}~~";	95	println "module: $typescript.compilerOptions.module";
141	println "~~target: $targe~~t";	96	println "lint: $lint";
142	println "~~module: $jsmodule~~";	97	println "symbols: $symbols";
143	}	98	}
144	}	99	}
145		100
146	task clean {	101	task clean {
147	doLast {	102	doLast {
148	delete buildDir	103	delete buildDir
149	delete typingsDir	104	}
		105	}
		106
		107	npmPackMeta {
		108	meta {
		109	name = packageName
		110	}
		111	}
		112
		113	configureTsCjs {
		114	dependsOn sources.main.output
		115	compilerOptions {
		116	types += [ "node" ]
		117	}
		118	}
		119
		120	configureTsAmd {
		121	dependsOn sources.main.output
		122	compilerOptions {
		123	types += [ "requirejs", "dojo-typings" ]
		124	}
		125	}
		126
		127	test {
		128	workingDir layout.buildDirectory.dir("test");
		129	commandLine "node", "tests/index.js"
		130	}
		131
		132	assemble {
		133	if (flavour == 'browser') {
		134	dependsOn sources.amd.output
		135	from sources.amd.output.compiledDir
		136	from sources.amd.resources
		137	}
		138	if (flavour == 'node') {
		139	dependsOn sources.cjs.output
		140	from sources.cjs.output.compiledDir
		141	from sources.cjs.resources
		142	}
		143	}
		144
		145	assembleTest {
		146	if (flavour == 'browser') {
		147	dependsOn sources.amd.output, sources.testAmd.output
		148
		149	from sources.amd.output.compiledDir
		150	from sources.testAmd.output.compiledDir
		151	from sources.amd.resources
		152	from sources.testAmd.resources
		153	}
		154	if (flavour == 'node') {
		155	dependsOn sources.cjs.output, sources.testCjs.output
		156
		157	from sources.cjs.output.compiledDir
		158	from sources.testCjs.output.compiledDir
		159	from sources.cjs.resources
		160	from sources.testCjs.resources
150	}	161	}
151	}	162	}
152		163
153	task _initBuild {	164	typings {
154	mustRunAfter clean	165	if (flavour == 'browser') {
155		166	dependsOn sources.amd.output
156	def buildInfoFile = "$buildDir/platform";	167	from sources.amd.output.typingsDir
157	inputs.property('target',target);	168	}
158	inputs.property('jsmodule',jsmodule);	169	if (flavour == 'node') {
159	outputs.file(buildInfoFile);	170	dependsOn sources.cjs.output
160		171	from sources.cjs.output.typingsDir
161	doLast {
162	delete buildDir
163	mkdir buildDir
164
165	def f = new File(buildInfoFile);
166	f << "$target-$jsmodule";
167	}	172	}
168	}	173	}
169		174
170	task cleanNpm {	175	task npmPackTypings(type: Copy) {
		176	npmPackContents.dependsOn it
		177	dependsOn sources.main.output
		178
		179	from sources.main.output.typingsDir
		180
		181	if (flavour == 'browser') {
		182	dependsOn sources.amd.output
		183	from sources.amd.output.typingsDir
		184	}
		185	if (flavour == 'node') {
		186	dependsOn sources.cjs.output
		187	from sources.cjs.output.typingsDir
		188	}
		189
		190	into npm.packageDir
		191	}
		192
		193	task npmPackSources(type: Copy) {
		194	from sources.main.ts
		195	if (symbols == 'pack') {
		196	npmPackContents.dependsOn npmPackSources
		197	}
		198
		199	if (flavour == 'browser') {
		200	from sources.amd.ts
		201	}
		202	if (flavour == 'node') {
		203	from sources.cjs.ts
		204	}
		205
		206	into npm.packageDir.dir("_src")
		207	}
		208
		209
		210
		211	task packJsTar(type: Tar) {
		212	dependsOn assemble;
		213
		214	archiveBaseName = provider { packageName }
		215
		216	destinationDirectory = buildDir
		217	archiveClassifier = provider { typescript.compilerOptions.module }
		218	compression = Compression.GZIP
		219
		220	from(assemble.outputs)
		221
171	doLast {	222	doLast {
172	delete 'node_modules'	223	println archiveName;
173	}	224	}
174	}	225	}
175		226
176	task _npmInstall() {	227	task packTypingsTar(type: Tar) {
177	inputs.file("package.json")	228	}
178	outputs.dir("node_modules")	229
179	doLast {	230	publishing {
180	exec {	231	publications {
181	commandLine 'npm', 'install'	232	local(IvyPublication) {
		233	artifact(packJsTar) {
		234	type = "js"
182	}	235	}
183	}	236	}
184	}	237	}
185		238
186	beforeBuild {	239	repositories {
187	dependsOn _initBuild	240	ivy {
188	dependsOn _npmInstall	241	url "ivy-repo"
189	}
190
191	sourceSets.each { createSoursetTasks(it, distDir) }
192
193	testSets.each { createSoursetTasks(it, testDir) }
194
195	compileTsAmd {
196	dependsOn compileTsMain
197	}
198
199	compileTsCjs {
200	dependsOn compileTsMain
201	}
202
203	task build(dependsOn: buildMain) {
204	if (jsmodule == "amd")
205	dependsOn buildAmd
206	if (jsmodule == "commonjs")
207	dependsOn buildCjs
208	}
209
210	compileTsTest {
211	dependsOn build
212	}
213
214	compileTsTestAmd {
215	dependsOn compileTsTest
216	}
217
218	compileTsTestCjs {
219	dependsOn compileTsTest
220	}
221
222	task _installLocalCjsDependency(dependsOn: [buildTestCjs, "_packageMeta"], type: Exec) {
223	inputs.file("$distDir/package.json")
224	outputs.upToDateWhen {
225	new File("$testDir/$packageName").exists()
226	}
227
228	workingDir testDir
229
230	commandLine 'npm', 'install', '--no-save', '--force', distDir
231	}	242	}
232
233	task test(dependsOn: [buildTest], type: Exec) {
234	if (jsmodule == "amd")
235	dependsOn buildTestAmd
236	if (jsmodule == "commonjs") {
237	dependsOn buildTestCjs
238	dependsOn _installLocalCjsDependency
239	}	243	}
240
241	commandLine 'node', "$testDir/run-tests.js"
242	}
243
244	task _packageMeta(type: Copy) {
245	mustRunAfter build
246
247	inputs.property("version", version)
248	from('.') {
249	include '.npmignore', 'readme.md', 'license', 'history.md'
250	}
251	from("$srcDir/package.${jsmodule}.tmpl.json") {
252	expand project.properties
253	rename { "package.json" }
254	}
255	into distDir
256	}
257
258	task pack(dependsOn: [build, _packageMeta], type: Exec) {
259	workingDir distDir
260	outputs.file("$npmScope-$npmName-${version}.tgz")
261
262	commandLine 'npm', 'pack'
263	}
264
265	task publish(dependsOn: [build, _packageMeta], type: Exec) {
266	doFirst {
267	if (!isRelease)
268	throw new Exception("Can't publish an unreleased version");
269	}
270	workingDir distDir
271
272	commandLine 'npm', 'publish', '--access', 'public'
273	}
274
275	task markRelease(type: Exec) {
276	onlyIf { tagDistance > 1 }
277	commandLine "hg", "tag", "v$version";
278	} No newline at end of file	244	}

gradle.properties +4 -4

+            group=org.implab
             version=
             author=Implab team
-            jsmodule=amd
+            description=Dependency injection, logging, simple and fast text processing tools
-            target=es5
-            description=Dependency injection, logging, simple and fast text template engine
             license=BSD-2-Clause
             repository=https://bitbucket.org/implab/implabjs-core
             npmScope=implab
-            npmName=core-amd
  No newline at end of file
+            flavour=browser
+            symbols=pack
  No newline at end of file

gradle/wrapper/gradle-wrapper.properties +1 -1

             distributionBase=GRADLE_USER_HOME
             distributionPath=wrapper/dists
-            distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+            distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
             zipStoreBase=GRADLE_USER_HOME
             zipStorePath=wrapper/dists

package-lock.json +969 -126

This diff has been collapsed as it changes many lines, (1095 lines changed) Show them Hide them
	@@ -4,10 +4,36
	4	"lockfileVersion": 1,	4	"lockfileVersion": 1,
	5	"requires": true,	5	"requires": true,
	6	"dependencies": {	6	"dependencies": {
			7	"@babel/code-frame": {
			8	"version": "7.5.5",
			9	"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
			10	"integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
			11	"dev": true,
			12	"requires": {
			13	"@babel/highlight": "^7.0.0"
			14	}
			15	},
			16	"@babel/highlight": {
			17	"version": "7.5.0",
			18	"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
			19	"integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
			20	"dev": true,
			21	"requires": {
			22	"chalk": "^2.0.0",
			23	"esutils": "^2.0.2",
			24	"js-tokens": "^4.0.0"
			25	}
			26	},
			27	"@types/chai": {
			28	"version": "4.2.3",
			29	"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.3.tgz",
			30	"integrity": "sha512-VRw2xEGbll3ZiTQ4J02/hUjNqZoue1bMhoo2dgM2LXjDdyaq4q80HgBDHwpI0/VKlo4Eg+BavyQMv/NYgTetzA==",
			31	"dev": true
			32	},
	7	"@types/node": {	33	"@types/node": {
	8	"version": "~~10.12.18~~",	34	"version": "8.10.55",
	9	"resolved": "https://registry.npmjs.org/@types/node/-/node-~~10.12.18~~.tgz",	35	"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.55.tgz",
	10	"integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==",	36	"integrity": "sha512-iZeh1EgupfmAAOASk580R1SL5lWF3CsBVgVH0395qyNF8fhO16xy1UwAav2PdGxIIsYRn7RzJgMGjdsvam6YYg==",
	11	"dev": true	37	"dev": true
	12	},	38	},
	13	"@types/requirejs": {	39	"@types/requirejs": {
	@@ -25,6 +51,66
	25	"@types/node": "*"	51	"@types/node": "*"
	26	}	52	}
	27	},	53	},
			54	"acorn": {
			55	"version": "7.1.0",
			56	"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
			57	"integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
			58	"dev": true
			59	},
			60	"acorn-jsx": {
			61	"version": "5.1.0",
			62	"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
			63	"integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
			64	"dev": true
			65	},
			66	"ajv": {
			67	"version": "6.10.2",
			68	"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
			69	"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
			70	"dev": true,
			71	"requires": {
			72	"fast-deep-equal": "^2.0.1",
			73	"fast-json-stable-stringify": "^2.0.0",
			74	"json-schema-traverse": "^0.4.1",
			75	"uri-js": "^4.2.2"
			76	}
			77	},
			78	"ansi-escapes": {
			79	"version": "3.2.0",
			80	"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
			81	"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
			82	"dev": true
			83	},
			84	"ansi-regex": {
			85	"version": "3.0.0",
			86	"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
			87	"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
			88	"dev": true
			89	},
			90	"ansi-styles": {
			91	"version": "3.2.1",
			92	"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
			93	"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
			94	"dev": true,
			95	"requires": {
			96	"color-convert": "^1.9.0"
			97	}
			98	},
			99	"argparse": {
			100	"version": "1.0.10",
			101	"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
			102	"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
			103	"dev": true,
			104	"requires": {
			105	"sprintf-js": "~1.0.2"
			106	}
			107	},
			108	"astral-regex": {
			109	"version": "1.0.0",
			110	"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
			111	"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
			112	"dev": true
			113	},
	28	"balanced-match": {	114	"balanced-match": {
	29	"version": "1.0.0",	115	"version": "1.0.0",
	30	"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",	116	"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
	@@ -41,22 +127,111
	41	"concat-map": "0.0.1"	127	"concat-map": "0.0.1"
	42	}	128	}
	43	},	129	},
			130	"builtin-modules": {
			131	"version": "1.1.1",
			132	"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
			133	"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
			134	"dev": true
			135	},
			136	"callsites": {
			137	"version": "3.1.0",
			138	"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
			139	"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
			140	"dev": true
			141	},
			142	"chalk": {
			143	"version": "2.4.2",
			144	"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
			145	"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
			146	"dev": true,
			147	"requires": {
			148	"ansi-styles": "^3.2.1",
			149	"escape-string-regexp": "^1.0.5",
			150	"supports-color": "^5.3.0"
			151	}
			152	},
			153	"chardet": {
			154	"version": "0.7.0",
			155	"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
			156	"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
			157	"dev": true
			158	},
			159	"cli-cursor": {
			160	"version": "2.1.0",
			161	"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
			162	"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
			163	"dev": true,
			164	"requires": {
			165	"restore-cursor": "^2.0.0"
			166	}
			167	},
			168	"cli-width": {
			169	"version": "2.2.0",
			170	"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
			171	"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
			172	"dev": true
			173	},
			174	"color-convert": {
			175	"version": "1.9.3",
			176	"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
			177	"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
			178	"dev": true,
			179	"requires": {
			180	"color-name": "1.1.3"
			181	}
			182	},
			183	"color-name": {
			184	"version": "1.1.3",
			185	"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
			186	"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
			187	"dev": true
			188	},
			189	"commander": {
			190	"version": "2.20.3",
			191	"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
			192	"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
			193	"dev": true
			194	},
	44	"concat-map": {	195	"concat-map": {
	45	"version": "0.0.1",	196	"version": "0.0.1",
	46	"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",	197	"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
	47	"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",	198	"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
	48	"dev": true	199	"dev": true
	49	},	200	},
	50	"c~~ore-util-is~~": {	201	"cross-spawn": {
	51	"version": "~~1.0.2~~",	202	"version": "6.0.5",
	52	"resolved": "https://registry.npmjs.org/c~~ore-util-is/-/core-util-is-1.0.2~~.tgz",	203	"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
	53	"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",	204	"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
			205	"dev": true,
			206	"requires": {
			207	"nice-try": "^1.0.4",
			208	"path-key": "^2.0.1",
			209	"semver": "^5.5.0",
			210	"shebang-command": "^1.2.0",
			211	"which": "^1.2.9"
			212	},
			213	"dependencies": {
			214	"semver": {
			215	"version": "5.7.1",
			216	"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
			217	"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
	54	"dev": true	218	"dev": true
			219	}
			220	}
	55	},	221	},
	56	"de~~ep-equal~~": {	222	"debug": {
	57	"version": "~~0.1.2~~",	223	"version": "4.1.1",
	58	"resolved": "https://registry.npmjs.org/de~~ep-equal/-/deep-equal-0.1.2~~.tgz",	224	"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
	59	"integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=",	225	"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
			226	"dev": true,
			227	"requires": {
			228	"ms": "^2.1.1"
			229	}
			230	},
			231	"deep-is": {
			232	"version": "0.1.3",
			233	"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
			234	"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
	60	"dev": true	235	"dev": true
	61	},	236	},
	62	"define-properties": {	237	"define-properties": {
	@@ -69,49 +244,71
	69	},	244	},
	70	"dependencies": {	245	"dependencies": {
	71	"object-keys": {	246	"object-keys": {
	72	"version": "1.~~0.12~~",	247	"version": "1.1.1",
	73	"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.~~0.12~~.tgz",	248	"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
	74	"integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",	249	"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
	75	"dev": true	250	"dev": true
	76	}	251	}
	77	}	252	}
	78	},	253	},
	79	"d~~efined~~": {	254	"diff": {
	80	"version": "~~0.0~~.0",	255	"version": "3.5.0",
	81	"resolved": "https://registry.npmjs.org/d~~efined/-/defined-0.0~~.0.tgz",	256	"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
	82	"integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=",	257	"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
	83	"dev": true	258	"dev": true
	84	},	259	},
			260	"doctrine": {
			261	"version": "3.0.0",
			262	"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
			263	"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
			264	"dev": true,
			265	"requires": {
			266	"esutils": "^2.0.2"
			267	}
			268	},
	85	"dojo": {	269	"dojo": {
	86	"version": "1.1~~4.2~~",	270	"version": "1.10.10",
	87	"resolved": "https://registry.npmjs.org/dojo/-/dojo-1.1~~4.2~~.tgz",	271	"resolved": "https://registry.npmjs.org/dojo/-/dojo-1.10.10.tgz",
	88	"integrity": "sha512-TI+Ytgfh/VfmHWERp45Jte6NFMdoJTPsvUP/uzJUvAXET8FP2h442LePWWJ/q/xZ4V0V8OtdJhx8It/GB+Zbxg==",	272	"integrity": "sha512-kg79C8Yyd317cG3MgXGMH4AeQ8TgNr8H/PpA3BRms7DTfl0CJCRAgGE/C6d9Nw55s1ID/fEsfS+P3bj1s7dWgA==",
	89	"dev": true	273	"dev": true
	90	},	274	},
	91	"duplexer": {	275	"dojo-typings": {
	92	"version": "0.1.1",	276	"version": "1.11.9",
	93	"resolved": "https://registry.npmjs.org/d~~uplexer/-/duplexer-0.1.1~~.tgz",	277	"resolved": "https://registry.npmjs.org/dojo-typings/-/dojo-typings-1.11.9.tgz",
	94	"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",	278	"integrity": "sha512-mh8w+Mau2Y1QfTEszEAdO7j6ycNhYxF/Ing6nAk1eUg6NxjeT0viVHjICMd9sU3U463vM2G+KfBBK5grk3/Mlw==",
			279	"dev": true,
			280	"requires": {
			281	"@types/chai": "^4.0.4"
			282	}
			283	},
			284	"emoji-regex": {
			285	"version": "7.0.3",
			286	"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
			287	"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
	95	"dev": true	288	"dev": true
	96	},	289	},
	97	"es-abstract": {	290	"es-abstract": {
	98	"version": "1.13.0",	291	"version": "1.15.0",
	99	"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",	292	"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz",
	100	"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",	293	"integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==",
	101	"dev": true,	294	"dev": true,
	102	"requires": {	295	"requires": {
	103	"es-to-primitive": "^1.2.0",	296	"es-to-primitive": "^1.2.0",
	104	"function-bind": "^1.1.1",	297	"function-bind": "^1.1.1",
	105	"has": "^1.0.3",	298	"has": "^1.0.3",
			299	"has-symbols": "^1.0.0",
	106	"is-callable": "^1.1.4",	300	"is-callable": "^1.1.4",
	107	"is-regex": "^1.0.4",	301	"is-regex": "^1.0.4",
	108	"object-~~keys~~": "^1.~~0.12"~~	302	"object-inspect": "^1.6.0",
			303	"object-keys": "^1.1.1",
			304	"string.prototype.trimleft": "^2.1.0",
			305	"string.prototype.trimright": "^2.1.0"
	109	},	306	},
	110	"dependencies": {	307	"dependencies": {
	111	"object-keys": {	308	"object-keys": {
	112	"version": "1.~~0.12~~",	309	"version": "1.1.1",
	113	"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.~~0.12~~.tgz",	310	"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
	114	"integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",	311	"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
	115	"dev": true	312	"dev": true
	116	}	313	}
	117	}	314	}
	@@ -127,37 +324,193
	127	"is-symbol": "^1.0.2"	324	"is-symbol": "^1.0.2"
	128	}	325	}
	129	},	326	},
	130	"faucet": {	327	"escape-string-regexp": {
	131	"version": "~~0.0.1~~",	328	"version": "1.0.5",
	132	"resolved": "https://registry.npmjs.org/~~faucet/-/faucet-0.0.1~~.tgz",	329	"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
	133	"integrity": "sha1-~~WX3PHSGJosBiMhtZHo8VHtIDnZw~~=",	330	"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
			331	"dev": true
			332	},
			333	"eslint": {
			334	"version": "6.1.0",
			335	"resolved": "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz",
			336	"integrity": "sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==",
			337	"dev": true,
			338	"requires": {
			339	"@babel/code-frame": "^7.0.0",
			340	"ajv": "^6.10.0",
			341	"chalk": "^2.1.0",
			342	"cross-spawn": "^6.0.5",
			343	"debug": "^4.0.1",
			344	"doctrine": "^3.0.0",
			345	"eslint-scope": "^5.0.0",
			346	"eslint-utils": "^1.3.1",
			347	"eslint-visitor-keys": "^1.0.0",
			348	"espree": "^6.0.0",
			349	"esquery": "^1.0.1",
			350	"esutils": "^2.0.2",
			351	"file-entry-cache": "^5.0.1",
			352	"functional-red-black-tree": "^1.0.1",
			353	"glob-parent": "^5.0.0",
			354	"globals": "^11.7.0",
			355	"ignore": "^4.0.6",
			356	"import-fresh": "^3.0.0",
			357	"imurmurhash": "^0.1.4",
			358	"inquirer": "^6.4.1",
			359	"is-glob": "^4.0.0",
			360	"js-yaml": "^3.13.1",
			361	"json-stable-stringify-without-jsonify": "^1.0.1",
			362	"levn": "^0.3.0",
			363	"lodash": "^4.17.14",
			364	"minimatch": "^3.0.4",
			365	"mkdirp": "^0.5.1",
			366	"natural-compare": "^1.4.0",
			367	"optionator": "^0.8.2",
			368	"progress": "^2.0.0",
			369	"regexpp": "^2.0.1",
			370	"semver": "^6.1.2",
			371	"strip-ansi": "^5.2.0",
			372	"strip-json-comments": "^3.0.1",
			373	"table": "^5.2.3",
			374	"text-table": "^0.2.0",
			375	"v8-compile-cache": "^2.0.3"
			376	}
			377	},
			378	"eslint-scope": {
			379	"version": "5.0.0",
			380	"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
			381	"integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
			382	"dev": true,
			383	"requires": {
			384	"esrecurse": "^4.1.0",
			385	"estraverse": "^4.1.1"
			386	}
			387	},
			388	"eslint-utils": {
			389	"version": "1.4.2",
			390	"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
			391	"integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
			392	"dev": true,
			393	"requires": {
			394	"eslint-visitor-keys": "^1.0.0"
			395	}
			396	},
			397	"eslint-visitor-keys": {
			398	"version": "1.1.0",
			399	"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
			400	"integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
			401	"dev": true
			402	},
			403	"espree": {
			404	"version": "6.1.1",
			405	"resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz",
			406	"integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==",
	134	"dev": true,	407	"dev": true,
	135	"requires": {	408	"requires": {
	136	"~~defined~~": "0.0.0",	409	"acorn": "^7.0.0",
	137	"~~duplexer~~": "~~~0.1.1~~",	410	"acorn-jsx": "^5.0.2",
	138	"~~minimist~~": "~~0.0.5"~~,	411	"eslint-visitor-keys": "^1.1.0"
	139	"sprintf": "~0.1.3",	412	}
	140	"tap-parser": "~0.4.0",	413	},
	141	"tape": "~2.3.2",	414	"esprima": {
	142	~~"through2~~": "~~~0.2.3"~~	415	"version": "4.0.1",
			416	"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
			417	"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
			418	"dev": true
			419	},
			420	"esquery": {
			421	"version": "1.0.1",
			422	"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
			423	"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
			424	"dev": true,
			425	"requires": {
			426	"estraverse": "^4.0.0"
			427	}
	143	},	428	},
	144	"dependencies": {	429	"esrecurse": {
	145	"tape": {	430	"version": "4.2.1",
	146	"version": "2.3.3",	431	"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
	147	"resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",	432	"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
	148	"integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",	433	"dev": true,
			434	"requires": {
			435	"estraverse": "^4.1.0"
			436	}
			437	},
			438	"estraverse": {
			439	"version": "4.3.0",
			440	"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
			441	"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
			442	"dev": true
			443	},
			444	"esutils": {
			445	"version": "2.0.3",
			446	"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
			447	"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
			448	"dev": true
			449	},
			450	"external-editor": {
			451	"version": "3.1.0",
			452	"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
			453	"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
	149	"dev": true,	454	"dev": true,
	150	"requires": {	455	"requires": {
	151	~~"deep-equal~~": "~~~0.1~~.0",	456	"chardet": "^0.7.0",
	152	"defined": "~0.0.0",	457	"iconv-lite": "^0.4.24",
	153	~~"inherits~~": "~~~2.0.1"~~,	458	"tmp": "^0.0.33"
	154	"jsonify": "~0.0.0",
	155	"resumer": "~0.0.0",
	156	"through": "~2.3.4"
	157	}	459	}
			460	},
			461	"fast-deep-equal": {
			462	"version": "2.0.1",
			463	"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
			464	"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
			465	"dev": true
			466	},
			467	"fast-json-stable-stringify": {
			468	"version": "2.0.0",
			469	"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
			470	"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
			471	"dev": true
			472	},
			473	"fast-levenshtein": {
			474	"version": "2.0.6",
			475	"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
			476	"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
			477	"dev": true
			478	},
			479	"figures": {
			480	"version": "2.0.0",
			481	"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
			482	"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
			483	"dev": true,
			484	"requires": {
			485	"escape-string-regexp": "^1.0.5"
	158	}	486	}
			487	},
			488	"file-entry-cache": {
			489	"version": "5.0.1",
			490	"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
			491	"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
			492	"dev": true,
			493	"requires": {
			494	"flat-cache": "^2.0.1"
	159	}	495	}
	160	},	496	},
			497	"flat-cache": {
			498	"version": "2.0.1",
			499	"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
			500	"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
			501	"dev": true,
			502	"requires": {
			503	"flatted": "^2.0.0",
			504	"rimraf": "2.6.3",
			505	"write": "1.0.3"
			506	}
			507	},
			508	"flatted": {
			509	"version": "2.0.1",
			510	"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
			511	"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
			512	"dev": true
			513	},
	161	"for-each": {	514	"for-each": {
	162	"version": "0.3.3",	515	"version": "0.3.3",
	163	"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",	516	"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
	@@ -179,10 +532,16
	179	"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",	532	"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
	180	"dev": true	533	"dev": true
	181	},	534	},
			535	"functional-red-black-tree": {
			536	"version": "1.0.1",
			537	"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
			538	"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
			539	"dev": true
			540	},
	182	"glob": {	541	"glob": {
	183	"version": "7.1.3",	542	"version": "7.1.4",
	184	"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",	543	"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
	185	"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",	544	"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
	186	"dev": true,	545	"dev": true,
	187	"requires": {	546	"requires": {
	188	"fs.realpath": "^1.0.0",	547	"fs.realpath": "^1.0.0",
	@@ -193,6 +552,21
	193	"path-is-absolute": "^1.0.0"	552	"path-is-absolute": "^1.0.0"
	194	}	553	}
	195	},	554	},
			555	"glob-parent": {
			556	"version": "5.1.0",
			557	"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
			558	"integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
			559	"dev": true,
			560	"requires": {
			561	"is-glob": "^4.0.1"
			562	}
			563	},
			564	"globals": {
			565	"version": "11.12.0",
			566	"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
			567	"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
			568	"dev": true
			569	},
	196	"has": {	570	"has": {
	197	"version": "1.0.3",	571	"version": "1.0.3",
	198	"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",	572	"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
	@@ -202,12 +576,49
	202	"function-bind": "^1.1.1"	576	"function-bind": "^1.1.1"
	203	}	577	}
	204	},	578	},
			579	"has-flag": {
			580	"version": "3.0.0",
			581	"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
			582	"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
			583	"dev": true
			584	},
	205	"has-symbols": {	585	"has-symbols": {
	206	"version": "1.0.0",	586	"version": "1.0.0",
	207	"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",	587	"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
	208	"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",	588	"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
	209	"dev": true	589	"dev": true
	210	},	590	},
			591	"iconv-lite": {
			592	"version": "0.4.24",
			593	"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
			594	"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
			595	"dev": true,
			596	"requires": {
			597	"safer-buffer": ">= 2.1.2 < 3"
			598	}
			599	},
			600	"ignore": {
			601	"version": "4.0.6",
			602	"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
			603	"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
			604	"dev": true
			605	},
			606	"import-fresh": {
			607	"version": "3.1.0",
			608	"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
			609	"integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
			610	"dev": true,
			611	"requires": {
			612	"parent-module": "^1.0.0",
			613	"resolve-from": "^4.0.0"
			614	}
			615	},
			616	"imurmurhash": {
			617	"version": "0.1.4",
			618	"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
			619	"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
			620	"dev": true
			621	},
	211	"inflight": {	622	"inflight": {
	212	"version": "1.0.6",	623	"version": "1.0.6",
	213	"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",	624	"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
	@@ -224,6 +635,27
	224	"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",	635	"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
	225	"dev": true	636	"dev": true
	226	},	637	},
			638	"inquirer": {
			639	"version": "6.5.2",
			640	"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
			641	"integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
			642	"dev": true,
			643	"requires": {
			644	"ansi-escapes": "^3.2.0",
			645	"chalk": "^2.4.2",
			646	"cli-cursor": "^2.1.0",
			647	"cli-width": "^2.0.0",
			648	"external-editor": "^3.0.3",
			649	"figures": "^2.0.0",
			650	"lodash": "^4.17.12",
			651	"mute-stream": "0.0.7",
			652	"run-async": "^2.2.0",
			653	"rxjs": "^6.4.0",
			654	"string-width": "^2.1.0",
			655	"strip-ansi": "^5.1.0",
			656	"through": "^2.3.6"
			657	}
			658	},
	227	"is-callable": {	659	"is-callable": {
	228	"version": "1.1.4",	660	"version": "1.1.4",
	229	"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",	661	"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
	@@ -236,6 +668,33
	236	"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",	668	"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
	237	"dev": true	669	"dev": true
	238	},	670	},
			671	"is-extglob": {
			672	"version": "2.1.1",
			673	"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
			674	"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
			675	"dev": true
			676	},
			677	"is-fullwidth-code-point": {
			678	"version": "2.0.0",
			679	"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
			680	"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
			681	"dev": true
			682	},
			683	"is-glob": {
			684	"version": "4.0.1",
			685	"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
			686	"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
			687	"dev": true,
			688	"requires": {
			689	"is-extglob": "^2.1.1"
			690	}
			691	},
			692	"is-promise": {
			693	"version": "2.1.0",
			694	"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
			695	"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
			696	"dev": true
			697	},
	239	"is-regex": {	698	"is-regex": {
	240	"version": "1.0.4",	699	"version": "1.0.4",
	241	"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",	700	"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
	@@ -254,16 +713,60
	254	"has-symbols": "^1.0.0"	713	"has-symbols": "^1.0.0"
	255	}	714	}
	256	},	715	},
	257	"is~~array~~": {	716	"isexe": {
	258	"version": "0.0.1",	717	"version": "2.0.0",
	259	"resolved": "https://registry.npmjs.org/is~~array/-/isarray-0.0.1~~.tgz",	718	"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
	260	"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",	719	"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
			720	"dev": true
			721	},
			722	"js-tokens": {
			723	"version": "4.0.0",
			724	"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
			725	"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
	261	"dev": true	726	"dev": true
	262	},	727	},
	263	"js~~onify~~": {	728	"js-yaml": {
	264	"version": "~~0.0.0~~",	729	"version": "3.13.1",
	265	"resolved": "https://registry.npmjs.org/js~~onify/-/jsonify-0.0.0~~.tgz",	730	"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
	266	"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",	731	"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
			732	"dev": true,
			733	"requires": {
			734	"argparse": "^1.0.7",
			735	"esprima": "^4.0.0"
			736	}
			737	},
			738	"json-schema-traverse": {
			739	"version": "0.4.1",
			740	"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
			741	"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
			742	"dev": true
			743	},
			744	"json-stable-stringify-without-jsonify": {
			745	"version": "1.0.1",
			746	"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
			747	"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
			748	"dev": true
			749	},
			750	"levn": {
			751	"version": "0.3.0",
			752	"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
			753	"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
			754	"dev": true,
			755	"requires": {
			756	"prelude-ls": "~1.1.2",
			757	"type-check": "~0.3.2"
			758	}
			759	},
			760	"lodash": {
			761	"version": "4.17.15",
			762	"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
			763	"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
			764	"dev": true
			765	},
			766	"mimic-fn": {
			767	"version": "1.2.0",
			768	"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
			769	"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
	267	"dev": true	770	"dev": true
	268	},	771	},
	269	"minimatch": {	772	"minimatch": {
	@@ -276,9 +779,42
	276	}	779	}
	277	},	780	},
	278	"minimist": {	781	"minimist": {
	279	"version": "0.0.5",	782	"version": "0.0.8",
	280	"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",	783	"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
	281	"integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=",	784	"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
			785	"dev": true
			786	},
			787	"mkdirp": {
			788	"version": "0.5.1",
			789	"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
			790	"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
			791	"dev": true,
			792	"requires": {
			793	"minimist": "0.0.8"
			794	}
			795	},
			796	"ms": {
			797	"version": "2.1.2",
			798	"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
			799	"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
			800	"dev": true
			801	},
			802	"mute-stream": {
			803	"version": "0.0.7",
			804	"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
			805	"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
			806	"dev": true
			807	},
			808	"natural-compare": {
			809	"version": "1.4.0",
			810	"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
			811	"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
			812	"dev": true
			813	},
			814	"nice-try": {
			815	"version": "1.0.5",
			816	"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
			817	"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
	282	"dev": true	818	"dev": true
	283	},	819	},
	284	"object-inspect": {	820	"object-inspect": {
	@@ -287,12 +823,6
	287	"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",	823	"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
	288	"dev": true	824	"dev": true
	289	},	825	},
	290	"object-keys": {
	291	"version": "0.4.0",
	292	"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
	293	"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
	294	"dev": true
	295	},
	296	"once": {	826	"once": {
	297	"version": "1.4.0",	827	"version": "1.4.0",
	298	"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",	828	"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
	@@ -302,29 +832,85
	302	"wrappy": "1"	832	"wrappy": "1"
	303	}	833	}
	304	},	834	},
			835	"onetime": {
			836	"version": "2.0.1",
			837	"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
			838	"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
			839	"dev": true,
			840	"requires": {
			841	"mimic-fn": "^1.0.0"
			842	}
			843	},
			844	"optionator": {
			845	"version": "0.8.2",
			846	"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
			847	"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
			848	"dev": true,
			849	"requires": {
			850	"deep-is": "~0.1.3",
			851	"fast-levenshtein": "~2.0.4",
			852	"levn": "~0.3.0",
			853	"prelude-ls": "~1.1.2",
			854	"type-check": "~0.3.2",
			855	"wordwrap": "~1.0.0"
			856	}
			857	},
			858	"os-tmpdir": {
			859	"version": "1.0.2",
			860	"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
			861	"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
			862	"dev": true
			863	},
			864	"parent-module": {
			865	"version": "1.0.1",
			866	"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
			867	"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
			868	"dev": true,
			869	"requires": {
			870	"callsites": "^3.0.0"
			871	}
			872	},
	305	"path-is-absolute": {	873	"path-is-absolute": {
	306	"version": "1.0.1",	874	"version": "1.0.1",
	307	"resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",	875	"resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
	308	"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",	876	"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
	309	"dev": true	877	"dev": true
	310	},	878	},
			879	"path-key": {
			880	"version": "2.0.1",
			881	"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
			882	"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
			883	"dev": true
			884	},
	311	"path-parse": {	885	"path-parse": {
	312	"version": "1.0.6",	886	"version": "1.0.6",
	313	"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",	887	"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
	314	"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",	888	"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
	315	"dev": true	889	"dev": true
	316	},	890	},
	317	"~~readable-stream~~": {	891	"prelude-ls": {
	318	"version": "1.1.14",	892	"version": "1.1.2",
	319	"resolved": "https://registry.npmjs.org/~~readable-stream/-/readable-stream-1.1.14~~.tgz",	893	"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
	320	"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",	894	"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
	321	"dev": true,	895	"dev": true
	322	"requires": {	896	},
	323	"core-util-is": "~1.0.0",	897	"progress": {
	324	~~"inherits~~": "~~~2.0.1~~",	898	"version": "2.0.3",
	325	"isarray": "0.0.1",	899	"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
	326	"string_decoder": "~0.10.x"	900	"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
	327	}	901	"dev": true
			902	},
			903	"punycode": {
			904	"version": "2.1.1",
			905	"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
			906	"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
			907	"dev": true
			908	},
			909	"regexpp": {
			910	"version": "2.0.1",
			911	"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
			912	"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
			913	"dev": true
	328	},	914	},
	329	"requirejs": {	915	"requirejs": {
	330	"version": "2.3.6",	916	"version": "2.3.6",
	@@ -333,12 +919,28
	333	"dev": true	919	"dev": true
	334	},	920	},
	335	"resolve": {	921	"resolve": {
	336	"version": "1.7.1",	922	"version": "1.11.1",
	337	"resolved": "http://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",	923	"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
	338	"integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",	924	"integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
	339	"dev": true,	925	"dev": true,
	340	"requires": {	926	"requires": {
	341	"path-parse": "^1.0.5"	927	"path-parse": "^1.0.6"
			928	}
			929	},
			930	"resolve-from": {
			931	"version": "4.0.0",
			932	"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
			933	"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
			934	"dev": true
			935	},
			936	"restore-cursor": {
			937	"version": "2.0.0",
			938	"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
			939	"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
			940	"dev": true,
			941	"requires": {
			942	"onetime": "^2.0.0",
			943	"signal-exit": "^3.0.2"
	342	}	944	}
	343	},	945	},
	344	"resumer": {	946	"resumer": {
	@@ -350,12 +952,104
	350	"through": "~2.3.4"	952	"through": "~2.3.4"
	351	}	953	}
	352	},	954	},
	353	"~~sprint~~f": {	955	"rimraf": {
	354	"version": "~~0.1.5~~",	956	"version": "2.6.3",
	355	"resolved": "https://registry.npmjs.org/~~sprintf/-/sprintf-0.1.5~~.tgz",	957	"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
	356	"integrity": "sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=",	958	"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
			959	"dev": true,
			960	"requires": {
			961	"glob": "^7.1.3"
			962	}
			963	},
			964	"run-async": {
			965	"version": "2.3.0",
			966	"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
			967	"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
			968	"dev": true,
			969	"requires": {
			970	"is-promise": "^2.1.0"
			971	}
			972	},
			973	"rxjs": {
			974	"version": "6.5.3",
			975	"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
			976	"integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
			977	"dev": true,
			978	"requires": {
			979	"tslib": "^1.9.0"
			980	}
			981	},
			982	"safer-buffer": {
			983	"version": "2.1.2",
			984	"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
			985	"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
			986	"dev": true
			987	},
			988	"semver": {
			989	"version": "6.3.0",
			990	"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
			991	"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
	357	"dev": true	992	"dev": true
	358	},	993	},
			994	"shebang-command": {
			995	"version": "1.2.0",
			996	"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
			997	"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
			998	"dev": true,
			999	"requires": {
			1000	"shebang-regex": "^1.0.0"
			1001	}
			1002	},
			1003	"shebang-regex": {
			1004	"version": "1.0.0",
			1005	"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
			1006	"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
			1007	"dev": true
			1008	},
			1009	"signal-exit": {
			1010	"version": "3.0.2",
			1011	"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
			1012	"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
			1013	"dev": true
			1014	},
			1015	"slice-ansi": {
			1016	"version": "2.1.0",
			1017	"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
			1018	"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
			1019	"dev": true,
			1020	"requires": {
			1021	"ansi-styles": "^3.2.0",
			1022	"astral-regex": "^1.0.0",
			1023	"is-fullwidth-code-point": "^2.0.0"
			1024	}
			1025	},
			1026	"sprintf-js": {
			1027	"version": "1.0.3",
			1028	"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
			1029	"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
			1030	"dev": true
			1031	},
			1032	"string-width": {
			1033	"version": "2.1.1",
			1034	"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
			1035	"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
			1036	"dev": true,
			1037	"requires": {
			1038	"is-fullwidth-code-point": "^2.0.0",
			1039	"strip-ansi": "^4.0.0"
			1040	},
			1041	"dependencies": {
			1042	"strip-ansi": {
			1043	"version": "4.0.0",
			1044	"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
			1045	"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
			1046	"dev": true,
			1047	"requires": {
			1048	"ansi-regex": "^3.0.0"
			1049	}
			1050	}
			1051	}
			1052	},
	359	"string.prototype.trim": {	1053	"string.prototype.trim": {
	360	"version": "1.1.2",	1054	"version": "1.1.2",
	361	"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",	1055	"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
	@@ -367,38 +1061,99
	367	"function-bind": "^1.0.2"	1061	"function-bind": "^1.0.2"
	368	}	1062	}
	369	},	1063	},
	370	"string_decoder": {	1064	"string.prototype.trimleft": {
	371	"version": "~~0.10.31~~",	1065	"version": "2.1.0",
	372	"resolved": "https://registry.npmjs.org/string~~_decoder/-/string_decoder-0.10.31~~.tgz",	1066	"resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
	373	"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",	1067	"integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
			1068	"dev": true,
			1069	"requires": {
			1070	"define-properties": "^1.1.3",
			1071	"function-bind": "^1.1.1"
			1072	}
			1073	},
			1074	"string.prototype.trimright": {
			1075	"version": "2.1.0",
			1076	"resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
			1077	"integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
			1078	"dev": true,
			1079	"requires": {
			1080	"define-properties": "^1.1.3",
			1081	"function-bind": "^1.1.1"
			1082	}
			1083	},
			1084	"strip-ansi": {
			1085	"version": "5.2.0",
			1086	"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
			1087	"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
			1088	"dev": true,
			1089	"requires": {
			1090	"ansi-regex": "^4.1.0"
			1091	},
			1092	"dependencies": {
			1093	"ansi-regex": {
			1094	"version": "4.1.0",
			1095	"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
			1096	"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
			1097	"dev": true
			1098	}
			1099	}
			1100	},
			1101	"strip-json-comments": {
			1102	"version": "3.0.1",
			1103	"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
			1104	"integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
	374	"dev": true	1105	"dev": true
	375	},	1106	},
	376	"tap-parser": {	1107	"supports-color": {
	377	"version": "~~0.4.3~~",	1108	"version": "5.5.0",
	378	"resolved": "https://registry.npmjs.org/~~tap-parser/-/tap-parser-0.4.3~~.tgz",	1109	"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
	379	"integrity": "sha1-pOrhkMENdsehEZIf84u+TVjwnuo=",	1110	"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
			1111	"dev": true,
			1112	"requires": {
			1113	"has-flag": "^3.0.0"
			1114	}
			1115	},
			1116	"table": {
			1117	"version": "5.4.6",
			1118	"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
			1119	"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
	380	"dev": true,	1120	"dev": true,
	381	"requires": {	1121	"requires": {
	382	"~~inherits~~": "~~~2.0.1~~",	1122	"ajv": "^6.10.2",
	383	"~~readable-stream~~": "~~~1.1.11"~~	1123	"lodash": "^4.17.14",
			1124	"slice-ansi": "^2.1.0",
			1125	"string-width": "^3.0.0"
			1126	},
			1127	"dependencies": {
			1128	"string-width": {
			1129	"version": "3.1.0",
			1130	"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
			1131	"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
			1132	"dev": true,
			1133	"requires": {
			1134	"emoji-regex": "^7.0.1",
			1135	"is-fullwidth-code-point": "^2.0.0",
			1136	"strip-ansi": "^5.1.0"
			1137	}
			1138	}
	384	}	1139	}
	385	},	1140	},
	386	"tape": {	1141	"tape": {
	387	"version": "4.~~9.2~~",	1142	"version": "4.11.0",
	388	"resolved": "https://registry.npmjs.org/tape/-/tape-4.~~9.2~~.tgz",	1143	"resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz",
	389	"integrity": "sha512-lPXKRKILZ1kZaUy5ynWKs8ATGSUO7HAFHCFnBam6FaGSqPdOwMWbxXHq4EXFLE8WRTleo/YOMXkaUTRmTB1Fiw==",	1144	"integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==",
	390	"dev": true,	1145	"dev": true,
	391	"requires": {	1146	"requires": {
	392	"deep-equal": "~1.0.1",	1147	"deep-equal": "~1.0.1",
	393	"defined": "~1.0.0",	1148	"defined": "~1.0.0",
	394	"for-each": "~0.3.3",	1149	"for-each": "~0.3.3",
	395	"function-bind": "~1.1.1",	1150	"function-bind": "~1.1.1",
	396	"glob": "~7.1.2",	1151	"glob": "~7.1.4",
	397	"has": "~1.0.3",	1152	"has": "~1.0.3",
	398	"inherits": "~2.0.3",	1153	"inherits": "~2.0.4",
	399	"minimist": "~1.2.0",	1154	"minimist": "~1.2.0",
	400	"object-inspect": "~1.6.0",	1155	"object-inspect": "~1.6.0",
	401	"resolve": "~1.7.1",	1156	"resolve": "~1.11.1",
	402	"resumer": "~0.0.0",	1157	"resumer": "~0.0.0",
	403	"string.prototype.trim": "~1.1.2",	1158	"string.prototype.trim": "~1.1.2",
	404	"through": "~2.3.8"	1159	"through": "~2.3.8"
	@@ -416,6 +1171,12
	416	"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",	1171	"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
	417	"dev": true	1172	"dev": true
	418	},	1173	},
			1174	"inherits": {
			1175	"version": "2.0.4",
			1176	"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
			1177	"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
			1178	"dev": true
			1179	},
	419	"minimist": {	1180	"minimist": {
	420	"version": "1.2.0",	1181	"version": "1.2.0",
	421	"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",	1182	"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
	@@ -424,32 +1185,114
	424	}	1185	}
	425	}	1186	}
	426	},	1187	},
			1188	"text-table": {
			1189	"version": "0.2.0",
			1190	"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
			1191	"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
			1192	"dev": true
			1193	},
	427	"through": {	1194	"through": {
	428	"version": "2.3.8",	1195	"version": "2.3.8",
	429	"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",	1196	"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
	430	"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",	1197	"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
	431	"dev": true	1198	"dev": true
	432	},	1199	},
	433	"t~~hrough2~~": {	1200	"tmp": {
	434	"version": "0.2.3",	1201	"version": "0.0.33",
	435	"resolved": "https://registry.npmjs.org/t~~hrough2/-/through2-0.2.~~3.tgz",	1202	"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
	436	"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",	1203	"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
	437	"dev": true,	1204	"dev": true,
	438	"requires": {	1205	"requires": {
	439	"readable-stream": "~1.1.9",	1206	"os-tmpdir": "~1.0.2"
	440	"xtend": "~2.1.1"
	441	}	1207	}
	442	},	1208	},
	443	"tslib": {	1209	"tslib": {
	444	"version": "1.~~9.3~~",	1210	"version": "1.10.0",
	445	"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.~~9.3~~.tgz",	1211	"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
	446	"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",	1212	"integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
	447	"dev": true	1213	"dev": true
	448	},	1214	},
			1215	"tslint": {
			1216	"version": "5.18.0",
			1217	"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz",
			1218	"integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
			1219	"dev": true,
			1220	"requires": {
			1221	"@babel/code-frame": "^7.0.0",
			1222	"builtin-modules": "^1.1.1",
			1223	"chalk": "^2.3.0",
			1224	"commander": "^2.12.1",
			1225	"diff": "^3.2.0",
			1226	"glob": "^7.1.1",
			1227	"js-yaml": "^3.13.1",
			1228	"minimatch": "^3.0.4",
			1229	"mkdirp": "^0.5.1",
			1230	"resolve": "^1.3.2",
			1231	"semver": "^5.3.0",
			1232	"tslib": "^1.8.0",
			1233	"tsutils": "^2.29.0"
			1234	},
			1235	"dependencies": {
			1236	"semver": {
			1237	"version": "5.7.1",
			1238	"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
			1239	"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
			1240	"dev": true
			1241	}
			1242	}
			1243	},
			1244	"tsutils": {
			1245	"version": "2.29.0",
			1246	"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
			1247	"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
			1248	"dev": true,
			1249	"requires": {
			1250	"tslib": "^1.8.1"
			1251	}
			1252	},
			1253	"type-check": {
			1254	"version": "0.3.2",
			1255	"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
			1256	"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
			1257	"dev": true,
			1258	"requires": {
			1259	"prelude-ls": "~1.1.2"
			1260	}
			1261	},
	449	"typescript": {	1262	"typescript": {
	450	"version": "3.~~2.2~~",	1263	"version": "3.6.4",
	451	"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.~~2.2~~.tgz",	1264	"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz",
	452	"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",	1265	"integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==",
			1266	"dev": true
			1267	},
			1268	"uri-js": {
			1269	"version": "4.2.2",
			1270	"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
			1271	"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
			1272	"dev": true,
			1273	"requires": {
			1274	"punycode": "^2.1.0"
			1275	}
			1276	},
			1277	"v8-compile-cache": {
			1278	"version": "2.1.0",
			1279	"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
			1280	"integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
			1281	"dev": true
			1282	},
			1283	"which": {
			1284	"version": "1.3.1",
			1285	"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
			1286	"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
			1287	"dev": true,
			1288	"requires": {
			1289	"isexe": "^2.0.0"
			1290	}
			1291	},
			1292	"wordwrap": {
			1293	"version": "1.0.0",
			1294	"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
			1295	"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
	453	"dev": true	1296	"dev": true
	454	},	1297	},
	455	"wrappy": {	1298	"wrappy": {
	@@ -458,13 +1301,13
	458	"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",	1301	"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
	459	"dev": true	1302	"dev": true
	460	},	1303	},
	461	"~~xtend~~": {	1304	"write": {
	462	"version": "~~2.1.2~~",	1305	"version": "1.0.3",
	463	"resolved": "https://registry.npmjs.org/~~xtend/-/xtend-2.1.2~~.tgz",	1306	"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
	464	"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",	1307	"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
	465	"dev": true,	1308	"dev": true,
	466	"requires": {	1309	"requires": {
	467	"~~object-keys~~": "~~~0.4.0~~"	1310	"mkdirp": "^0.5.1"
	468	}	1311	}
	469	}	1312	}
	470	}	1313	}

package.json +11 -12

@@ -17,19 +17,18
17	"access": "public"	17	"access": "public"
18	},	18	},
19	"peerDependencies": {	19	"peerDependencies": {
20	"dojo": "^1.10.0",	20	"dojo": "^1.10.0"
21	"tslib": "latest"
22	},	21	},
23	"devDependencies": {	22	"devDependencies": {
24	"@types/node": "~~latest~~",	23	"@types/node": "^8.0.0",
25	"@types/requirejs": "~~latest~~",	24	"@types/requirejs": "~2.1.31",
26	"@types/tape": "~~latest~~",	25	"@types/tape": "~4.2.33",
27	"dojo": "^1.10.0",	26	"dojo": "~1.10.0",
28	"faucet": "latest",	27	"dojo-typings": "^1.11.9",
29	"requirejs": "latest",	28	"requirejs": "latest",
30	"tape": "~~^4.9.2~~",	29	"tape": "~4.11.0",
31	"tslib": "latest",	30	"typescript": "~3.6.4",
32	"typescript": "latest"	31	"eslint": "6.1.0",
33	},	32	"tslint": "5.18.0"
34	"types": "main.d.ts"
35	}	33	}
		34	}

src/amd/ts/di/ResolverHelper.ts +1 -1

             import m = require("module");
             const sandboxId = Uuid();
-            define(sandboxId, ["require"], r => r);
+            define(sandboxId, ["require"], (r: any) => r);
             const globalRequire = getGlobal().require as Require || requirejs;

src/amd/tsconfig.json +4 -6

                 "extends": "../tsconfig",
                 "compilerOptions": {
                     "types": [
-                        "requirejs"
+                        "requirejs",
+                        "dojo-typings"
                     ],
                     "rootDir": "ts",
                     "rootDirs": [
                         "ts",
-                        "../typings/main"
+                        "../main/ts"
                     ]
-                },
-                "include": [
-                    "ts/**/*.ts"
             }

src/test/ts/mock/MockActivationController.ts +2 -2

-            import { IActivatable, ICancellation, IActivationController } from "@implab/core/interfaces";
+            import { IActivatable, ICancellation, IActivationController } from "../interfaces";
-            import { Cancellation } from "@implab/core/Cancellation";
+            import { Cancellation } from "../Cancellation";
             export class MockActivationController implements IActivationController {

src/test/ts/mock/MockConsole.ts +1 -1

-            import {NullConsole} from "@implab/core/log/NullConsole";
+            import {NullConsole} from "../log/NullConsole";
             interface ConsoleLineData {
                 level: string;

src/test/ts/mock/SimpleActivatable.ts +2 -2

-            import { AsyncComponent } from "@implab/core/components/AsyncComponent";
+            import { AsyncComponent } from "../components/AsyncComponent";
-            import { ActivatableMixin } from "@implab/core/components/ActivatableMixin";
+            import { ActivatableMixin } from "../components/ActivatableMixin";
             export class SimpleActivatable extends ActivatableMixin(AsyncComponent) {

src/test/tsconfig.json +3 -4

                 "compilerOptions": {
                     "rootDir": "ts",
                     "baseUrl": ".",
-                    "paths": {
+                    "rootDirs": [
-                        "@implab/core/*": [
+                        "ts",
-                            "../../build/dist/*"
+                        "../main/ts"
                     ]
                 },
                 "include" : [
                     "ts/**/*.ts"

src/tsconfig.json +2 -3

                     "noEmitOnError": true,
                     "listFiles": true,
                     "types": [],
-                    "lib": ["es5", "es2015.promise", "es2015.symbol", "dom", "scripthost"]
+                    "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
-                },
-                "files": []
             }

tslint.json +1 0

             {
                 "extends": "tslint:recommended",
+                "defaultSeverity": "warn",
                 "rules": {
                     "align": [
                         true,

src/package.amd.tmpl.json removed 0 -24

NO CONTENT: file was removed

src/package.commonjs.tmpl.json removed 0 -21

NO CONTENT: file was removed

src/test/ts/ActivatableTests.ts removed 0 -54

NO CONTENT: file was removed

src/test/ts/CancellationTests.ts removed 0 -88

NO CONTENT: file was removed

src/test/ts/ContainerTests.ts removed 0 -93

NO CONTENT: file was removed

src/test/ts/ObservableTests.ts removed 0 -69

NO CONTENT: file was removed

src/test/ts/SafeTests.ts removed 0 -95

NO CONTENT: file was removed

src/test/ts/TestTraits.ts removed 0 -74

NO CONTENT: file was removed

src/test/ts/TextTests.ts removed 0 -86

NO CONTENT: file was removed

src/test/ts/TraceSourceTests.ts removed 0 -89

NO CONTENT: file was removed

src/test/ts/dummy.ts removed 0 -13

NO CONTENT: file was removed

src/testAmd/js/example.js removed 0 -7

NO CONTENT: file was removed

src/testAmd/js/plan.js removed 0 -10

NO CONTENT: file was removed

src/testAmd/js/run-tests.js removed 0 -22

NO CONTENT: file was removed

src/testAmd/js/trace-test.js removed 0 -30

NO CONTENT: file was removed

src/testCjs/ts/plan.ts removed 0 -7

NO CONTENT: file was removed

src/testCjs/ts/run-tests.ts removed 0 -1

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