implab/implabjs-core Commit - r46:747292a4f3ac

fixed object activation when a single argument passed to the constructor.

cin -

r46:747292a4f3ac di-typescript

parent child

Context file:

r46:747292a4f3ac

Collapse all files

package-lock.json +7 -7

                  },
                  "duplexer": {
                    "version": "0.1.1",
-                   "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+                   "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
                    "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
                    "dev": true
                  },
                    "dependencies": {
                      "tape": {
                        "version": "2.3.3",
-                       "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
+                       "resolved": "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz",
                        "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=",
                        "dev": true,
                        "requires": {
                  },
                  "path-is-absolute": {
                    "version": "1.0.1",
-                   "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+                   "resolved": "http://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": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                   "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                    "dev": true,
                    "requires": {
                  },
                  "string_decoder": {
                    "version": "0.10.31",
-                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                   "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                    "dev": true
                  },
                  },
                  "through": {
                    "version": "2.3.8",
-                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+                   "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
                    "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
                    "dev": true
                  },
                  "through2": {
                    "version": "0.2.3",
-                   "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+                   "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                    "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                    "dev": true,
                    "requires": {

src/ts/di/Configuration.ts +1 -1

                  }
                  async _loadModule(moduleName: string) {
-                     trace.log("loadModule {0}", moduleName);
+                     trace.debug("loadModule {0}", moduleName);
                      const m = await new Promise(fulfill => {
                          this._require([moduleName], fulfill);

src/ts/di/ServiceDescriptor.ts 0 -1

                                  injectMethod(instance, m, context, spec[m]);
                          });
                      }
                      return instance;
                  }
              }

src/ts/di/TypeServiceDescriptor.ts +7 -1

                      const ctor = this._type = opts.type;
-                     if (this._params && this._params.length) {
+                     if (this._params) {
+                         if (this._params.length) {
                          this._factory = (...args) => {
                              const t = Object.create(ctor.prototype);
                              const inst = ctor.apply(t, args);
                              return isPrimitive(inst) ? t : inst;
                          };
                      } else {
+                             this._factory = arg => {
+                                 return new ctor(arg);
+                             };
+                         }
+                     } else {
                          this._factory = () => {
                              return new ctor();
                          };

test/js/mock/config1.js +3 0

                              provider: {
                                  $dependency: "db"
                              }
+                         },
+                         foo: {
+                             $type: "./Foo:Foo"
                          }
                      }
                  },

test/ts/ContainerTests.ts +3 -2

                  t.assert(!isNull(f1), "foo should be not null");
-                 const b1 = container.resolve("bar");
+                 const b1 = container.resolve("bar") as Bar;
-                 t.assert(!isNull(b1), "foo should be not null");
+                 t.assert(!isNull(b1), "bar should not be null");
+                 t.assert(!isNull(b1.foo), "bar.foo should not be null");
              });

test/ts/mock/Bar.ts +9 0

+             import { Foo } from "./Foo";
              export class Bar {
                  name = "bar";
+                 foo: Foo;
+                 constructor(_opts) {
+                     if (_opts && _opts.foo)
+                         this.foo = _opts.foo;
              }
+             }

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