implab/implabjs-core Commit - r50:7a4fac383b10

tests moved under src/ folder...

cin -

r50:7a4fac383b10 di-typescript

parent child

Context file:

r50:7a4fac383b10

Expand all files

src/cjs/ts/di/CjsConfiguration.ts created 644 0 0

NO CONTENT: new file 100644

src/cjs/tsconfig.json created 644 +11 0

@@ -0,0 +1,11
	1	{
	2	"extends": "../tsconfig.json",
	3	"compilerOptions": {
	4	"types": [
	5	"@types/node"
	6	]
	7	},
	8	"include": [
	9	"ts/*/.ts"
	10	]
	11	} No newline at end of file

package-lock.json +7 -7

                 },
                 "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": {
                 },
                 "path-is-absolute": {
                   "version": "1.0.1",
-                  "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                   "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
                   "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
                 },
                 },
                 "through": {
                   "version": "2.3.8",
-                  "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+                  "resolved": "https://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",
+                  "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                   "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                   "dev": true,
                   "requires": {

src/amd/ts/di/RequireJsHelper.ts +13 -8

             import { Uuid } from "../Uuid";
-            import { argumentNotEmptyString } from "../safe";
+            import { argumentNotEmptyString, argumentNotNull } from "../safe";
             import { TraceSource } from "../log/TraceSource";
-            export const rjs = require;
-            declare function define(name: string, modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
-            declare function define(modules: string[], cb?: (...args: any[]) => any, eb?: (e) => any): void;
             const trace = TraceSource.get("@implab/core/di/RequireJsHelper");
             export async function createContextRequire(moduleName: string): Promise<Require> {
                 trace.debug(`define shim ${shim}`);
-                return new Promise<Require>(fulfill => {
+                return new Promise<Require>(cb => {
                     define(shim, ["require"], r => {
                         trace.debug("shim resolved");
                         return r;
                     });
-                    require([shim], fulfill);
+                    require([shim], cb);
                 });
             }
+            export function makeResolver(req: Require) {
+                argumentNotNull(req, "req");
+                return (name: string) => {
+                    return new Promise<any>((cb, eb) => {
+                        req([name], cb, eb);
+                    });
+                };
+            }

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

             import { ReferenceDescriptor } from "./ReferenceDescriptor";
             import { TypeServiceDescriptor } from "./TypeServiceDescriptor";
             import { FactoryServiceDescriptor } from "./FactoryServiceDescriptor";
-            import { rjs, createContextRequire } from "./RequireJsHelper";
             import { TraceSource } from "../log/TraceSource";
             import { ConfigError } from "./ConfigError";
             import { Cancellation } from "../Cancellation";
                 }
             }
-            interface MapOf<T> {
+            type Resolver = (qname: string) => any;
-                [key: string]: T;
             type _key = string | number;
                 _configName: string;
-                _require = rjs;
+                _require: Resolver;
                 constructor(container: Container) {
                     argumentNotNull(container, container);
                     this._path = [];
                 }
-                async loadConfiguration(moduleName: string, ct = Cancellation.none) {
+                async applyConfiguration(data: object, resolver?: Resolver, ct = Cancellation.none) {
-                    argumentNotEmptyString(moduleName, "moduleName");
-                    trace.log("loadConfiguration {0}", moduleName);
-                    this._configName = moduleName;
-                    const config = await this._loadModule(moduleName);
-                    this._require = await this._createContextRequire(moduleName);
-                    let services: ServiceMap;
-                    try {
-                        services = await this._visitRegistrations(config, moduleName);
-                    } catch (e) {
-                        throw this._makeError(e);
-                    this._container.register(services);
-                async applyConfiguration(data: object, contextRequire?: Require, ct = Cancellation.none) {
                     argumentNotNull(data, "data");
                     trace.log("applyConfiguration");
                     this._configName = "$";
-                    if (contextRequire)
+                    if (resolver)
-                        this._require = contextRequire;
+                        this._require = resolver;
                     let services: ServiceMap;
                 async _loadModule(moduleName: string) {
                     trace.debug("loadModule {0}", moduleName);
-                    const m = await new Promise(fulfill => {
+                    const m = await this._require(moduleName);
-                        this._require([moduleName], fulfill);
-                    });
                     return m;
                 }
-                _createContextRequire(moduleName: string) {
-                    return createContextRequire(moduleName);
                 async _visitRegistrations(data, name: _key) {
                     this._enter(name);

src/main/ts/di/Container.ts +1 -1

                  *  The function which will be used to load a configuration or types for services.
                  *
                  */
-                async configure(config: string | object, opts?: any, ct = Cancellation.none) {
+                async configure(config: string | object, opts?, ct = Cancellation.none) {
                     const c = new Configuration(this);
                     if (typeof (config) === "string") {

src/test/js/example.js ~~test/js/example.js~~ renamed 0 0

NO CONTENT: file renamed from test/js/example.js to src/test/js/example.js

src/test/js/mock/config1.js ~~test/js/mock/config1.js~~ renamed 0 0

NO CONTENT: file renamed from test/js/mock/config1.js to src/test/js/mock/config1.js

src/test/js/plan.js ~~test/js/plan.js~~ renamed 0 0

NO CONTENT: file renamed from test/js/plan.js to src/test/js/plan.js

src/test/js/trace-test.js ~~test/js/trace-test.js~~ renamed 0 0

NO CONTENT: file renamed from test/js/trace-test.js to src/test/js/trace-test.js

src/test/ts/ActivatableTests.ts ~~test/ts/ActivatableTests.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/ActivatableTests.ts to src/test/ts/ActivatableTests.ts

src/test/ts/CancellationTests.ts ~~test/ts/CancellationTests.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/CancellationTests.ts to src/test/ts/CancellationTests.ts

src/test/ts/ContainerTests.ts ~~test/ts/ContainerTests.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/ContainerTests.ts to src/test/ts/ContainerTests.ts

src/test/ts/ObservableTests.ts ~~test/ts/ObservableTests.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/ObservableTests.ts to src/test/ts/ObservableTests.ts

src/test/ts/TestTraits.ts ~~test/ts/TestTraits.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/TestTraits.ts to src/test/ts/TestTraits.ts

src/test/ts/TraceSourceTests.ts ~~test/ts/TraceSourceTests.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/TraceSourceTests.ts to src/test/ts/TraceSourceTests.ts

src/test/ts/dummy.ts ~~test/ts/dummy.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/dummy.ts to src/test/ts/dummy.ts

src/test/ts/mock/Bar.ts ~~test/ts/mock/Bar.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/mock/Bar.ts to src/test/ts/mock/Bar.ts

src/test/ts/mock/Foo.ts ~~test/ts/mock/Foo.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/mock/Foo.ts to src/test/ts/mock/Foo.ts

src/test/ts/mock/MockActivationController.ts ~~test/ts/mock/MockActivationController.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/mock/MockActivationController.ts to src/test/ts/mock/MockActivationController.ts

src/test/ts/mock/SimpleActivatable.ts ~~test/ts/mock/SimpleActivatable.ts~~ renamed 0 0

NO CONTENT: file renamed from test/ts/mock/SimpleActivatable.ts to src/test/ts/mock/SimpleActivatable.ts

src/test/tsconfig.json ~~test/tsconfig.json~~ renamed 0 0

NO CONTENT: file renamed from test/tsconfig.json to src/test/tsconfig.json

src/tsconfig.json +2 -1

                     ],
                     "rootDirs": [
                         "main/ts",
-                        "amd/ts"
+                        "amd/ts",
+                        "cjs/ts"
                     ],
                     "types": []
                 }

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