implab/implabjs-core Commit - r60:b23fe4a1683a

src/testAmd/js/run-tests.js created 644 +22 0

@@ -0,0 +1,22
	1	var rjs = require('requirejs');
	2
	3	rjs.config({
	4	baseUrl: '.',
	5	packages: [{
	6	name: "@implab/core",
	7	location: "build/dist"
	8	},
	9	{
	10	name: "test",
	11	location: "build/test"
	12	},
	13	{
	14	name: "dojo",
	15	location: "node_modules/dojo"
	16	}
	17	],
	18	nodeRequire: require
	19	});
	20
	21
	22	rjs(['test/plan']); No newline at end of file

src/testCjs/js/mock/config1.js created 644 +20 0

@@ -0,0 +1,20
	1	module.exports = {
	2	foo: {
	3	$type: "./Foo:Foo"
	4	},
	5
	6	bar: {
	7	$type: "./Bar:Bar",
	8	params: {
	9	db: {
	10	provider: {
	11	$dependency: "db"
	12	}
	13	},
	14	foo: {
	15	$type: "./Foo:Foo"
	16	}
	17	}
	18	},
	19	db: "db://localhost"
	20	};

src/testCjs/js/package.json created 644 +11 0

@@ -0,0 +1,11
	1	{
	2	"name": "@implab/core-test",
	3	"version": "0.0.1-dev",
	4	"main": "main.js",
	5	"author": "Implab team",
	6	"license": "BSD-2-Clause",
	7	"repository": "https://bitbucket.org/implab/implabjs",
	8	"publishConfig": {
	9	"access": "public"
	10	}
	11	}

src/testCjs/ts/plan.ts created 644 +5 0

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

src/testCjs/ts/run-tests.ts created 644 +1 0

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

src/testCjs/tsconfig.json created 644 +22 0

@@ -0,0 +1,22
	1	{
	2	"extends": "../tsconfig",
	3	"compilerOptions": {
	4	"rootDir": "ts",
	5	"baseUrl": ".",
	6	"paths": {
	7	"@implab/core/*": [
	8	"../../build/dist/*"
	9	]
	10	},
	11	"types": [
	12	"node"
	13	],
	14	"rootDirs": [
	15	"ts",
	16	"../typings/test"
	17	]
	18	},
	19	"include" : [
	20	"ts/*/.ts"
	21	]
	22	} No newline at end of file

build.gradle +36 -27

                     into outDir
                 }
-                def compileTypingsTask = task "compileTypings$setName"(dependsOn: beforeBuildTask, type: Exec) {
+                def compileTsTask = task "compileTs$setName"(dependsOn: beforeBuildTask, type: Exec) {
                     inputs.dir("$setDir/ts")
                     inputs.file("$srcDir/tsconfig.json")
                     inputs.file("$setDir/tsconfig.json")
+                    outputs.dir(destDir)
                     outputs.dir(declDir)
                     commandLine 'node_modules/.bin/tsc',
                         '-t', target,
                         '-m', jsmodule,
                         '-d',
-                        '--emitDeclarationOnly',
+                        '--outDir', destDir,
                         '--declarationDir', declDir
                     if (lib)
                         args '--lib', lib
                 }
-                def compileTsTask = task "compileTs$setName"(dependsOn: beforeBuildTask, type: Exec) {
-                    inputs.dir("$setDir/ts")
-                    inputs.file("$srcDir/tsconfig.json")
-                    inputs.file("$setDir/tsconfig.json")
-                    outputs.dir(destDir)
-                    commandLine 'node_modules/.bin/tsc',
-                        '-p', "$setDir/tsconfig.json",
-                        '-t', target,
-                        '-m', jsmodule,
-                        '--outDir', destDir
-                    if (lib)
-                        args '--lib', lib
                 def copyTsOutputTask = task "copyTsOutput$setName"(dependsOn: compileTsTask, type: Copy) {
-                    from compileTsTask
+                    from destDir
                     into outDir
                 }
-                def copyTypingsTask = task "copyTypings$setName"(dependsOn: compileTypingsTask, type: Copy) {
+                def copyTypingsTask = task "copyTypings$setName"(dependsOn: compileTsTask, type: Copy) {
-                    from compileTypingsTask
+                    from declDir
                     into outDir
                 }
             testSets.each { createSoursetTasks(it, testDir) }
             compileTsAmd {
-                dependsOn compileTypingsMain
+                dependsOn compileTsMain
             }
-            compileTypingsAmd {
+            compileTsCjs {
-                dependsOn compileTypingsMain
+                dependsOn compileTsMain
             }
             task build(dependsOn: buildMain) {
                 if (jsmodule == "amd")
                     dependsOn buildAmd
+                if (jsmodule == "commonjs")
+                    dependsOn buildCjs
             }
             compileTsTest {
             }
             compileTsTestAmd {
-                dependsOn compileTypingsTestAmd
+                dependsOn compileTsTest
+            }
+            compileTsTestCjs {
+                dependsOn compileTsTest
             }
-            task test(dependsOn: [buildTest, buildTestAmd], type: Exec) {
+            task _installLocalCjsDependency(dependsOn: [buildTestCjs, "_packageMeta"], type: Exec) {
-                commandLine 'node', "$testDir/run-amd-tests.js"
+                inputs.file("$distDir/package.json")
+                outputs.upToDateWhen {
+                    new File("$testDir/$packageName").exists()
+                }
+                workingDir testDir
+                commandLine 'npm', 'install', '--no-save', '--force', distDir
+            }
+            task test(dependsOn: [buildTest], type: Exec) {
+                if (jsmodule == "amd")
+                    dependsOn buildTestAmd
+                if (jsmodule == "commonjs") {
+                    dependsOn buildTestCjs
+                    dependsOn _installLocalCjsDependency
+                }
+                commandLine 'node', "$testDir/run-tests.js"
             }
             task _packageMeta(type: Copy) {

package-lock.json +6 -6

                 },
                 "duplexer": {
                   "version": "0.1.1",
-                  "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                   "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                   "dev": true
                 },
                   "dependencies": {
                     "tape": {
                       "version": "2.3.3",
-                      "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
+                      "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                       "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                       "dev": true,
                       "requires": {
                 },
                 "minimist": {
                   "version": "0.0.5",
-                  "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
                   "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=",
                   "dev": true
                 },
                 },
                 "readable-stream": {
                   "version": "1.1.14",
-                  "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                   "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "dev": true,
                   "requires": {
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                   "dev": true
                 },
                 },
                 "through2": {
                   "version": "0.2.3",
-                  "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {

src/amd/ts/di/ResolverHelper.ts +6 0

             }
             export function makeResolver(moduleName: string, contextRequire: Require) {
+                trace.debug(
+                    "makeResolver moduleName={0}, contextRequire={1}",
+                    moduleName || "<nil>",
+                    contextRequire ? typeof (contextRequire) : "<nil>"
+                );
                 const base = moduleName && moduleName.split("/").slice(0, -1).join("/");
                 const resolver = new ModuleResolver(contextRequire, base);

src/main/ts/di/Configuration.ts +6 -2

                 async loadConfiguration(moduleName: string, contextRequire?: any, ct = Cancellation.none) {
                     argumentNotEmptyString(moduleName, "moduleName");
-                    trace.log("loadConfiguration moduleName={0}", moduleName);
+                    trace.log(
+                        "loadConfiguration moduleName={0}, contextRequire={1}",
+                        moduleName,
+                        contextRequire ? typeof (contextRequire) : "<nil>"
+                    );
                     this._configName = moduleName;
                 applyConfiguration(data: object, contextRequire?: any, ct = Cancellation.none) {
                     argumentNotNull(data, "data");
-                    return this._applyConfiguration(data, makeResolver(void(0), contextRequire), ct);
+                    return this._applyConfiguration(data, makeResolver(void (0), contextRequire), ct);
                 }
                 async _applyConfiguration(data: object, resolver?: ModuleResolver, ct = Cancellation.none) {

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

             test("Load configuration from module", async t => {
                 const container = new Container();
-                await container.configure("test/mock/config1");
+                await container.configure("./mock/config1", { contextRequire: require });
                 t.pass("The configuration should load");
                 const f1 = container.resolve("foo");

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

NO CONTENT: file was removed

	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