implab/implabjs-core Commit - r89:441fae622bca

migrating tests to the new project structure

cin -

r89:441fae622bca ts-plugin

parent child

Context file:

r89:441fae622bca

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>

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	});

build.gradle +30 -25

             plugins {
               id "org.implab.gradle-typescript" version "1.0.1-rc1"
             }
             // если версия явно не заданы вычисляем ее из тэга ревизии v.{num}***
             // результатом будет версия '{num}.{distance}' где distance - расстояние от
             // текущей ревизии до ревизии с тэгом
             def tagDistance = 0;
-            def isRelease = false;
             if (!version) {
                 def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
                 def tagVersion;
                 def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
                 if (match.size()) {
                     tagVersion = match[0][1];
                     tagDistance = match[0][2].toInteger();
                 } else {
                     throw new Exception("A version must be specied");
                 }
                 version = tagVersion;
                 if (tagDistance > 0)
                     version++;
             } else {
                 println "explicit version: $version";
             }
             if (hasProperty('versionSuffix') && versionSuffix) {
                 version += "-$versionSuffix"
             }
-            if(!npmName)
+            if(! jsmodule in ["amd", "commonjs", "system", "umd", "es6", "esnext"])
-                npmName = name;
-            if (hasProperty('release')) {
-                isRelease = (release != 'false')
-            } else {
-                isRelease = (tagDistance == 0);
-            if(!["amd", "commonjs", "system", "umd", "es6", "esnext"].contains(jsmodule))
                 throw new Exception("Invalid jsmodule specified: $jsmodule");
-            if(!["es3", "es5", "es6", "es2016", "es2017", "esnext"].contains(target))
+            if(! target in ["es3", "es5", "es6", "es2016", "es2017", "esnext"])
                 throw new Exception("Invalid target specified: $target")
-            def targetLibs = [
-                "es3" : ["es5", "es2015.promise", "es2015.symbol", "dom", "scripthost"],
-                "es5" : ["es5", "es2015.promise", "es2015.symbol", "dom", "scripthost"]
-            ];
             ext {
                 packageName = "@$npmScope/$npmName"
             }
             def jstarget = target;
             sources {
+                amd {
                 }
+                cjs {
+                }
+            }
             typescript {
                 compilerOptions {
-                    lib = targetLibs[target] ?: [target, "dom"]
+                    lib = [target, "dom", "scripthost"]
+                    if (jstarget in ["es5", "es3"])
+                        lib += ["es2015.promise"]
                     target = jstarget
                     module = jsmodule
                     types = []
+                    declaration = true
+                    listFiles = true
                 }
                 tsLintCmd = "tslint"
             	esLintCmd = "eslint"
             	npmCmd = "npm"
             }
+            configureTsMain {
+                compilerOptions {
+                    if (jstarget in ["es5", "es3"])
+                        lib += ["es2015.symbol", "es2015.iterable"]
+                }
+            }
+            configureTsTest {
+                compilerOptions {
+                    types += [ "node" ]
+                }
+            }
             task printVersion {
                 doLast {
                     println "version: $version";
-                    println "isRelease: $isRelease, tagDistance: $tagDistance";
+                    println "tagDistance: $tagDistance";
                     println "packageName: $packageName";
                     println "bundle: ${npmPack.outputs.files.join(',')}";
                     println "target: $jstarget";
                     println "module: $jsmodule";
                 }
             }
             task clean {
                 doLast {
                     delete buildDir
                 }
             }
             npmPackMeta {
                 meta {
-                    name = "@$npmScope/$npmName"
+                    name = packageName
                 }
             }
-            task markRelease(type: Exec) {
-                onlyIf { tagDistance > 1 }
-                commandLine "hg", "tag", "v$version";
-            }
  No newline at end of file

package-lock.json +3 -3

             {
               "name": "@implab/core",
               "version": "0.0.1-dev",
               "lockfileVersion": 1,
               "requires": true,
               "dependencies": {
                 "@types/node": {
-                  "version": "10.12.18",
+                  "version": "8.10.55",
-                  "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz",
+                  "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.55.tgz",
-                  "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==",
+                  "integrity": "sha512-iZeh1EgupfmAAOASk580R1SL5lWF3CsBVgVH0395qyNF8fhO16xy1UwAav2PdGxIIsYRn7RzJgMGjdsvam6YYg==",
                   "dev": true
                 },
                 "@types/requirejs": {
                   "version": "2.1.31",
                   "resolved": "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.31.tgz",
                   "integrity": "sha512-b2soeyuU76rMbcRJ4e0hEl0tbMhFwZeTC0VZnfuWlfGlk6BwWNsev6kFu/twKABPX29wkX84wU2o+cEJoXsiTw==",
                   "dev": true
                 },
                 "@types/tape": {
                   "version": "4.2.33",
                   "resolved": "https://registry.npmjs.org/@types/tape/-/tape-4.2.33.tgz",
                   "integrity": "sha512-ltfyuY5BIkYlGuQfwqzTDT8f0q8Z5DGppvUnWGs39oqDmMd6/UWhNpX3ZMh/VYvfxs3rFGHMrLC/eGRdLiDGuw==",
                   "dev": true,
                   "requires": {
                     "@types/node": "*"
                   }
                 },
                 "balanced-match": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
                   "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
                   "dev": true
                 },
                 "brace-expansion": {
                   "version": "1.1.11",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
                   "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
                   "dev": true,
                   "requires": {
                     "balanced-match": "^1.0.0",
                     "concat-map": "0.0.1"
                   }
                 },
                 "concat-map": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                   "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
                   "dev": true
                 },
                 "core-util-is": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                   "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
                   "dev": true
                 },
                 "deep-equal": {
                   "version": "0.1.2",
                   "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz",
                   "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=",
                   "dev": true
                 },
                 "define-properties": {
                   "version": "1.1.3",
                   "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
                   "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
                   "dev": true,
                   "requires": {
                     "object-keys": "^1.0.12"
                   },
                   "dependencies": {
                     "object-keys": {
                       "version": "1.0.12",
                       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
                       "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
                       "dev": true
                     }
                   }
                 },
                 "defined": {
                   "version": "0.0.0",
                   "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
                   "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=",
                   "dev": true
                 },
                 "dojo": {
                   "version": "1.14.2",
                   "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.14.2.tgz",
                   "integrity": "sha512-TI+Ytgfh/VfmHWERp45Jte6NFMdoJTPsvUP/uzJUvAXET8FP2h442LePWWJ/q/xZ4V0V8OtdJhx8It/GB+Zbxg==",
                   "dev": true
                 },
                 "duplexer": {
                   "version": "0.1.1",
                   "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                   "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                   "dev": true
                 },
                 "es-abstract": {
                   "version": "1.13.0",
                   "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
                   "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
                   "dev": true,
                   "requires": {
                     "es-to-primitive": "^1.2.0",
                     "function-bind": "^1.1.1",
                     "has": "^1.0.3",
                     "is-callable": "^1.1.4",
                     "is-regex": "^1.0.4",
                     "object-keys": "^1.0.12"
                   },
                   "dependencies": {
                     "object-keys": {
                       "version": "1.0.12",
                       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
                       "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
                       "dev": true
                     }
                   }
                 },
                 "es-to-primitive": {
                   "version": "1.2.0",
                   "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
                   "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
                   "dev": true,
                   "requires": {
                     "is-callable": "^1.1.4",
                     "is-date-object": "^1.0.1",
                     "is-symbol": "^1.0.2"
                   }
                 },
                 "faucet": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/faucet/-/faucet-0.0.1.tgz",
                   "integrity": "sha1-WX3PHSGJosBiMhtZHo8VHtIDnZw=",
                   "dev": true,
                   "requires": {
                     "defined": "0.0.0",
                     "duplexer": "~0.1.1",
                     "minimist": "0.0.5",
                     "sprintf": "~0.1.3",
                     "tap-parser": "~0.4.0",
                     "tape": "~2.3.2",
                     "through2": "~0.2.3"
                   },
                   "dependencies": {
                     "tape": {
                       "version": "2.3.3",
                       "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                       "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                       "dev": true,
                       "requires": {
                         "deep-equal": "~0.1.0",
                         "defined": "~0.0.0",
                         "inherits": "~2.0.1",
                         "jsonify": "~0.0.0",
                         "resumer": "~0.0.0",
                         "through": "~2.3.4"
                       }
                     }
                   }
                 },
                 "for-each": {
                   "version": "0.3.3",
                   "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
                   "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
                   "dev": true,
                   "requires": {
                     "is-callable": "^1.1.3"
                   }
                 },
                 "fs.realpath": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
                   "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
                   "dev": true
                 },
                 "function-bind": {
                   "version": "1.1.1",
                   "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
                   "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
                   "dev": true
                 },
                 "glob": {
                   "version": "7.1.3",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
                   "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
                   "dev": true,
                   "requires": {
                     "fs.realpath": "^1.0.0",
                     "inflight": "^1.0.4",
                     "inherits": "2",
                     "minimatch": "^3.0.4",
                     "once": "^1.3.0",
                     "path-is-absolute": "^1.0.0"
                   }
                 },
                 "has": {
                   "version": "1.0.3",
                   "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
                   "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
                   "dev": true,
                   "requires": {
                     "function-bind": "^1.1.1"
                   }
                 },
                 "has-symbols": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
                   "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
                   "dev": true
                 },
                 "inflight": {
                   "version": "1.0.6",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
                   "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
                   "dev": true,
                   "requires": {
                     "once": "^1.3.0",
                     "wrappy": "1"
                   }
                 },
                 "inherits": {
                   "version": "2.0.3",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                   "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
                   "dev": true
                 },
                 "is-callable": {
                   "version": "1.1.4",
                   "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
                   "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
                   "dev": true
                 },
                 "is-date-object": {
                   "version": "1.0.1",
                   "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
                   "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
                   "dev": true
                 },
                 "is-regex": {
                   "version": "1.0.4",
                   "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
                   "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
                   "dev": true,
                   "requires": {
                     "has": "^1.0.1"
                   }
                 },
                 "is-symbol": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
                   "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
                   "dev": true,
                   "requires": {
                     "has-symbols": "^1.0.0"
                   }
                 },
                 "isarray": {
                   "version": "0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
                   "dev": true
                 },
                 "jsonify": {
                   "version": "0.0.0",
                   "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
                   "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
                   "dev": true
                 },
                 "minimatch": {
                   "version": "3.0.4",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                   "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
                   "dev": true,
                   "requires": {
                     "brace-expansion": "^1.1.7"
                   }
                 },
                 "minimist": {
                   "version": "0.0.5",
                   "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
                   "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=",
                   "dev": true
                 },
                 "object-inspect": {
                   "version": "1.6.0",
                   "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
                   "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
                   "dev": true
                 },
                 "object-keys": {
                   "version": "0.4.0",
                   "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
                   "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
                   "dev": true
                 },
                 "once": {
                   "version": "1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                   "dev": true,
                   "requires": {
                     "wrappy": "1"
                   }
                 },
                 "path-is-absolute": {
                   "version": "1.0.1",
                   "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                   "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
                   "dev": true
                 },
                 "path-parse": {
                   "version": "1.0.6",
                   "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
                   "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
                   "dev": true
                 },
                 "readable-stream": {
                   "version": "1.1.14",
                   "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                   "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "dev": true,
                   "requires": {
                     "core-util-is": "~1.0.0",
                     "inherits": "~2.0.1",
                     "isarray": "0.0.1",
                     "string_decoder": "~0.10.x"
                   }
                 },
                 "requirejs": {
                   "version": "2.3.6",
                   "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
                   "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
                   "dev": true
                 },
                 "resolve": {
                   "version": "1.7.1",
                   "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
                   "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
                   "dev": true,
                   "requires": {
                     "path-parse": "^1.0.5"
                   }
                 },
                 "resumer": {
                   "version": "0.0.0",
                   "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
                   "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
                   "dev": true,
                   "requires": {
                     "through": "~2.3.4"
                   }
                 },
                 "sprintf": {
                   "version": "0.1.5",
                   "resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz",
                   "integrity": "sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=",
                   "dev": true
                 },
                 "string.prototype.trim": {
                   "version": "1.1.2",
                   "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
                   "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
                   "dev": true,
                   "requires": {
                     "define-properties": "^1.1.2",
                     "es-abstract": "^1.5.0",
                     "function-bind": "^1.0.2"
                   }
                 },
                 "string_decoder": {
                   "version": "0.10.31",
                   "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                   "dev": true
                 },
                 "tap-parser": {
                   "version": "0.4.3",
                   "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-0.4.3.tgz",
                   "integrity": "sha1-pOrhkMENdsehEZIf84u+TVjwnuo=",
                   "dev": true,
                   "requires": {
                     "inherits": "~2.0.1",
                     "readable-stream": "~1.1.11"
                   }
                 },
                 "tape": {
                   "version": "4.9.2",
                   "resolved": "https://registry.npmjs.org/tape/-/tape-4.9.2.tgz",
                   "integrity": "sha512-lPXKRKILZ1kZaUy5ynWKs8ATGSUO7HAFHCFnBam6FaGSqPdOwMWbxXHq4EXFLE8WRTleo/YOMXkaUTRmTB1Fiw==",
                   "dev": true,
                   "requires": {
                     "deep-equal": "~1.0.1",
                     "defined": "~1.0.0",
                     "for-each": "~0.3.3",
                     "function-bind": "~1.1.1",
                     "glob": "~7.1.2",
                     "has": "~1.0.3",
                     "inherits": "~2.0.3",
                     "minimist": "~1.2.0",
                     "object-inspect": "~1.6.0",
                     "resolve": "~1.7.1",
                     "resumer": "~0.0.0",
                     "string.prototype.trim": "~1.1.2",
                     "through": "~2.3.8"
                   },
                   "dependencies": {
                     "deep-equal": {
                       "version": "1.0.1",
                       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
                       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
                       "dev": true
                     },
                     "defined": {
                       "version": "1.0.0",
                       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
                       "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
                       "dev": true
                     },
                     "minimist": {
                       "version": "1.2.0",
                       "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
                       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                       "dev": true
                     }
                   }
                 },
                 "through": {
                   "version": "2.3.8",
                   "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
                   "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
                   "dev": true
                 },
                 "through2": {
                   "version": "0.2.3",
                   "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {
                     "readable-stream": "~1.1.9",
                     "xtend": "~2.1.1"
                   }
                 },
                 "tslib": {
                   "version": "1.9.3",
                   "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
                   "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
                   "dev": true
                 },
                 "typescript": {
                   "version": "3.2.2",
                   "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
                   "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
                   "dev": true
                 },
                 "wrappy": {
                   "version": "1.0.2",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                   "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
                   "dev": true
                 },
                 "xtend": {
                   "version": "2.1.2",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
                   "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
                   "dev": true,
                   "requires": {
                     "object-keys": "~0.4.0"
                   }
                 }
               }
             }

package.json +1 -1

             {
               "name": "@implab/core",
               "version": "0.0.1-dev",
               "description": "Dependency injection, logging, simple and fast text template engine",
               "main": "main.js",
               "keywords": [
                 "di",
                 "ioc",
                 "logging",
                 "template engine",
                 "dependency injection"
               ],
               "author": "Implab team",
               "license": "BSD-2-Clause",
               "repository": "https://bitbucket.org/implab/implabjs",
               "publishConfig": {
                 "access": "public"
               },
               "peerDependencies": {
                 "dojo": "^1.10.0",
                 "tslib": "latest"
               },
               "devDependencies": {
-                "@types/node": "latest",
+                "@types/node": "^8.0.0",
                 "@types/requirejs": "latest",
                 "@types/tape": "latest",
                 "dojo": "^1.10.0",
                 "faucet": "latest",
                 "requirejs": "latest",
                 "tape": "^4.9.2",
                 "tslib": "latest",
                 "typescript": "latest"
               },
               "types": "main.d.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 {
                 _active: IActivatable = null;
                 getActive(): IActivatable {
                     return this._active;
                 }
                 async deactivate() {
                     if (this._active)
                         await this._active.deactivate();
                     this._active = null;
                 }
                 async activate(component: IActivatable) {
                     if (!component || component.isActive())
                         return;
                     component.setActivationController(this);
                     await component.activate();
                 }
                 async activating(component: IActivatable, ct: ICancellation = Cancellation.none) {
                     if (component !== this._active)
                         await this.deactivate();
                 }
                 async activated(component: IActivatable, ct: ICancellation = Cancellation.none) {
                     this._active = component;
                 }
                 async deactivating(component: IActivatable, ct: ICancellation = Cancellation.none) {
                 }
                 async deactivated(component: IActivatable, ct: ICancellation = Cancellation.none) {
                     if (this._active === component)
                         this._active = null;
                 }
             }

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

-            import {NullConsole} from "@implab/core/log/NullConsole";
+            import {NullConsole} from "../log/NullConsole";
             interface ConsoleLineData {
                 level: string;
                 data: any[];
             }
             export class MockConsole extends NullConsole {
                 _buffer: ConsoleLineData[] = [];
                 debug(...args: any[]) {
                     this._buffer.push({
                         level: "debug",
                         data: args
                     });
                 }
                 log(...args: any[]) {
                     this._buffer.push({
                         level: "log",
                         data: args
                     });
                 }
                 warn(...args: any[]) {
                     this._buffer.push({
                         level: "warn",
                         data: args
                     });
                 }
                 error(...args: any[]) {
                     this._buffer.push({
                         level: "error",
                         data: args
                     });
                 }
                 getBuffer() {
                     return this._buffer;
                 }
                 getLine(i: number) {
                     if (i >= this._buffer.length)
                         throw new Error(`Line number ${i} is out of range, buffer.length = ${this._buffer.length}`);
                     return this._buffer[i].data;
                 }
                 clear() {
                     this._buffer = [];
                 }
             }

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

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

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

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