implab/implabjs-djx Commit - r8:6d80d7901b4c

sync

cin -

r8:6d80d7901b4c v1.0.0-rc3 default

parent child

Context file:

r8:6d80d7901b4c

Collapse all files

src/test/ts/index.ts created 644 0 0

NO CONTENT: new file 100644

build.gradle +12 -1

             plugins {
-                id "org.implab.gradle-typescript" version "1.3.2"
+                id "org.implab.gradle-typescript" version "1.3.3"
                 id "ivy-publish"
             }
             typescript {
                 compilerOptions {
                     lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
                     //listFiles = true
                     declaration = true
                     strict = true
                     types = []
                     module = "amd"
                     it.target = "es5"
                     experimentalDecorators = true
                     jsx = "react"
                     jsxFactory = "createElement"
                     moduleResolution = "node"
                     // dojo-typings are sick
                     skipLibCheck = true
                     // traceResolution = true
                     // baseUrl = "./"
                     // paths = [ "*": [ "$projectDir/src/typings/*" ] ]
                     // baseUrl = "$projectDir/src/typings"
                     // typeRoots = ["$projectDir/src/typings"]
                 }
                 tscCmd = "$projectDir/node_modules/.bin/tsc"
                 tsLintCmd = "$projectDir/node_modules/.bin/tslint"
             	esLintCmd = "$projectDir/node_modules/.bin/eslint"
             }
             configureTsMain {
                 compilerOptions {
                     types = ["requirejs", "dojo-typings"]
                 }
             }
+            configureTsTest {
+                compilerOptions {
+                    baseUrl = "."
+                    paths = [
+                        "@implab/djx" : [ sources.main.output.typingsDir.get().toString() ],
+                        "@implab/djx/*" : [ "${sources.main.output.typingsDir.get().toString()}/*" ]
+                    ]
+                    types = ["requirejs", sources.main.output.typingsDir.get().toString()]
+                }
+            }
             npmPackMeta {
                 meta {
                     name = "@$npmScope/$project.name"
                 }
             }
             task npmPackTypings(type: Copy) {
                 dependsOn typings
                 npmPackContents.dependsOn it
                 from typescript.typingsDir
                 into npm.packageDir
             }
             task printVersion {
                 doLast {
                     println "packageName: ${npmPackMeta.metadata.get().name}";
                     println "version: $version";
                     println "target: $typescript.compilerOptions.target";
                     println "module: $typescript.compilerOptions.module";
                     println "symbols: $symbols";
                 }
             }

src/test/ts/TestTraits.ts 0 -2

             import { IObservable, ICancellation, IDestroyable } from "@implab/core-amd/interfaces";
             import { Cancellation } from "@implab/core-amd/Cancellation";
             import { TraceEvent, LogLevel, WarnLevel, DebugLevel, TraceSource } from "@implab/core-amd/log/TraceSource";
             import { argumentNotNull, destroy } from "@implab/core-amd/safe";
             import { TapWriter } from "./Tap";
             export class TapeWriter implements IDestroyable {
                 private readonly _t: TapWriter;
                 private readonly _subscriptions = new Array<IDestroyable>();
                 private _destroyed = false;
                 constructor(t: TapWriter) {
                     argumentNotNull(t, "test");
                     this._t = t;
                 }
                 writeEvents(source: IObservable<TraceEvent>, ct: ICancellation = Cancellation.none) {
                     if (!this._destroyed) {
                         const subscription = source.on(this.writeEvent.bind(this));
                         if (ct.isSupported()) {
                             ct.register(subscription.destroy.bind(subscription));
                         }
                         this._subscriptions.push(subscription);
                     }
                 }
                 writeEvent(next: TraceEvent) {
                     if (next.level >= DebugLevel) {
                         this._t.comment(`DEBUG ${next.source.id} ${next}`);
                     } else if (next.level >= LogLevel) {
                         this._t.comment(`LOG   ${next.source.id} ${next}`);
                     } else if (next.level >= WarnLevel) {
                         this._t.comment(`WARN  ${next.source.id} ${next}`);
                     } else {
                         this._t.comment(`ERROR ${next.source.id} ${next}`);
                     }
                 }
                 destroy() {
                     if (this._destroyed)
                         return;
                     this._destroyed = true;
                     this._subscriptions.forEach(destroy);
                 }
             }
             type TestCallback = (ok: (msg: string) => void, fail: (msg: string) => void, trace: TraceSource) => void;
             type AsyncTestCallback = (trace: TraceSource) => PromiseLike<void>;
-            export function test(name: string, cb: TestCallback ): void;
-            export function test(name: string, cb: AsyncTestCallback): void;
             export function test(name: string, cb: TestCallback | AsyncTestCallback) {
             }
             export function run() {
             }

src/test/ts/dummy.ts +1 -1

             import { test } from "./TestTraits";
             import { delay } from "@implab/core-amd/safe";
             import { assert } from "chai";
-            import "@implab/djx";
             import css = require("@implab/djx/css!my,css");
+            import {} from "@implab/djx/i18n";
             test("simple", (ok, fail, log) => {
                 setTimeout(() => {
                     // end should be called after the last assertion
                     ok("async assert");
                 }, 100);
             });
             test("simple", async log => {
                 await delay(0);
                 assert.ok(true); // everything is fine
             });

src/test/tsconfig.json +3 -3

             {
                 "extends": "../tsconfig",
                 "compilerOptions": {
                     "baseUrl": ".",
                     "rootDir": "ts",
                     "rootDirs": [
                         "ts",
                         "typings",
                         "../main/ts",
                         "../main/typings"
                     ],
                     "paths": {
-                        "@implab/djx" : ["../main/ts", "../main/typings"]
+                        "@implab/djx" : ["../main/ts", "../main/typings"],
-                        //"@implab/djx/*" : ["../main/ts/*", "../main/typings/*" ]
+                        "@implab/djx/*" : ["../main/ts/*", "../main/typings/*" ]
                     },
-                    "types": ["requirejs"]
+                    "types": ["requirejs", "../main/typings"]
                 }
             }

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