inversify 4.13.0 → 4.14.0

package/lib/container/container.js

@@ -43,7 +43,7 @@ var metadata_reader_1 = require("../planning/metadata_reader");
 var planner_1 = require("../planning/planner");
 var resolver_1 = require("../resolution/resolver");
 var binding_to_syntax_1 = require("../syntax/binding_to_syntax");
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var serialization_1 = require("../utils/serialization");
 var container_snapshot_1 = require("./container_snapshot");
 var lookup_1 = require("./lookup");
@@ -78,7 +78,7 @@ var Container = (function () {
             defaultScope: options.defaultScope,
             skipBaseClassChecks: options.skipBaseClassChecks
         };
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this._bindingDictionary = new lookup_1.Lookup();
         this._snapshots = [];
         this._middleware = null;
@@ -109,7 +109,7 @@ var Container = (function () {
         var getHelpers = this._getContainerModuleHelpersFactory();
         for (var _a = 0, modules_1 = modules; _a < modules_1.length; _a++) {
             var currentModule = modules_1[_a];
-            var containerModuleHelpers = getHelpers(currentModule.guid);
+            var containerModuleHelpers = getHelpers(currentModule.id);
             currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction);
         }
     };
@@ -129,7 +129,7 @@ var Container = (function () {
                     case 1:
                         if (!(_a < modules_2.length)) return [3, 4];
                         currentModule = modules_2[_a];
-                        containerModuleHelpers = getHelpers(currentModule.guid);
+                        containerModuleHelpers = getHelpers(currentModule.id);
                         return [4, currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction)];
                     case 2:
                         _b.sent();
@@ -152,7 +152,7 @@ var Container = (function () {
             return item.moduleId === expected;
         }; };
         modules.forEach(function (module) {
-            var condition = conditionFactory(module.guid);
+            var condition = conditionFactory(module.id);
             _this._bindingDictionary.removeByCondition(condition);
         });
     };
@@ -211,7 +211,7 @@ var Container = (function () {
         this._middleware = snapshot.middleware;
     };
     Container.prototype.createChild = function (containerOptions) {
-        var child = new Container(containerOptions);
+        var child = new Container(containerOptions || this.options);
         child.parent = this;
         return child;
     };
@@ -245,9 +245,8 @@ var Container = (function () {
         return this.getAllTagged(serviceIdentifier, METADATA_KEY.NAMED_TAG, named);
     };
     Container.prototype.resolve = function (constructorFunction) {
-        var tempContainer = new Container();
+        var tempContainer = this.createChild();
         tempContainer.bind(constructorFunction).toSelf();
-        tempContainer.parent = this;
         return tempContainer.get(constructorFunction);
     };
     Container.prototype._getContainerModuleHelpersFactory = function () {

package/lib/container/container_module.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var ContainerModule = (function () {
     function ContainerModule(registry) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.registry = registry;
     }
     return ContainerModule;
@@ -11,7 +11,7 @@ var ContainerModule = (function () {
 exports.ContainerModule = ContainerModule;
 var AsyncContainerModule = (function () {
     function AsyncContainerModule(registry) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.registry = registry;
     }
     return AsyncContainerModule;

package/lib/inversify.js

@@ -32,8 +32,8 @@ var post_construct_1 = require("./annotation/post_construct");
 exports.postConstruct = post_construct_1.postConstruct;
 var metadata_reader_1 = require("./planning/metadata_reader");
 exports.MetadataReader = metadata_reader_1.MetadataReader;
-var guid_1 = require("./utils/guid");
-exports.guid = guid_1.guid;
+var id_1 = require("./utils/id");
+exports.id = id_1.id;
 var decorator_utils_1 = require("./annotation/decorator_utils");
 exports.decorate = decorator_utils_1.decorate;
 var constraint_helpers_1 = require("./syntax/constraint_helpers");

package/lib/planning/context.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var Context = (function () {
     function Context(container) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.container = container;
     }
     Context.prototype.addPlan = function (plan) {

package/lib/planning/request.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var Request = (function () {
     function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.serviceIdentifier = serviceIdentifier;
         this.parentContext = parentContext;
         this.parentRequest = parentRequest;

package/lib/planning/target.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var METADATA_KEY = require("../constants/metadata_keys");
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var metadata_1 = require("./metadata");
 var queryable_string_1 = require("./queryable_string");
 var Target = (function () {
     function Target(type, name, serviceIdentifier, namedOrTagged) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.type = type;
         this.serviceIdentifier = serviceIdentifier;
         this.name = new queryable_string_1.QueryableString(name || "");

package/lib/resolution/resolver.js

@@ -47,8 +47,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                requestScope.has(binding_1.guid)) {
-                return requestScope.get(binding_1.guid);
+                requestScope.has(binding_1.id)) {
+                return requestScope.get(binding_1.id);
             }
             if (binding_1.type === literal_types_1.BindingTypeEnum.ConstantValue) {
                 result = binding_1.cache;
@@ -84,8 +84,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                !requestScope.has(binding_1.guid)) {
-                requestScope.set(binding_1.guid, result);
+                !requestScope.has(binding_1.id)) {
+                requestScope.set(binding_1.id, result);
             }
             return result;
         }

package/lib/utils/id.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var idCounter = 0;
+function id() {
+    return idCounter++;
+}
+exports.id = id;

package/package.json

@@ -1,80 +1,80 @@
-{
-  "name": "inversify",
-  "version": "4.13.0",
-  "description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.",
-  "main": "lib/inversify.js",
-  "jsnext:main": "es/inversify.js",
-  "types": "./dts/inversify.d.ts",
-  "directories": {
-    "test": "gulp"
-  },
-  "scripts": {
-    "test": "gulp",
-    "publish-please": "publish-please",
-    "prepublish": "publish-please guard"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/inversify/InversifyJS.git"
-  },
-  "keywords": [
-    "ioc",
-    "di",
-    "javascript",
-    "typescript",
-    "node",
-    "dependency injection",
-    "dependency inversion",
-    "inversion of control container"
-  ],
-  "author": "Remo H. Jansen",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/inversify/InversifyJS/issues"
-  },
-  "homepage": "http://inversify.io",
-  "engines": {},
-  "devDependencies": {
-    "@types/chai": "4.1.2",
-    "@types/harmony-proxy": "1.0.29",
-    "@types/mocha": "5.0.0",
-    "@types/sinon": "4.3.1",
-    "bluebird": "3.5.1",
-    "browserify": "16.2.0",
-    "chai": "4.1.2",
-    "del": "3.0.0",
-    "es6-symbol": "3.1.1",
-    "gulp": "3.9.1",
-    "gulp-istanbul": "1.1.3",
-    "gulp-mocha": "5.0.0",
-    "gulp-rename": "1.2.2",
-    "gulp-sourcemaps": "2.6.3",
-    "gulp-tslint": "8.1.3",
-    "gulp-typescript": "4.0.2",
-    "gulp-uglify": "3.0.0",
-    "harmonize": "2.0.0",
-    "harmony-proxy": "1.0.1",
-    "istanbul": "0.4.5",
-    "karma": "2.0.0",
-    "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-commonjs": "1.0.0",
-    "karma-es6-shim": "1.0.0",
-    "karma-firefox-launcher": "1.1.0",
-    "karma-ie-launcher": "1.0.0",
-    "karma-mocha": "1.3.0",
-    "karma-mocha-reporter": "2.2.5",
-    "karma-phantomjs-launcher": "1.0.4",
-    "karma-sinon": "1.0.5",
-    "mocha": "5.1.0",
-    "performance-now": "2.1.0",
-    "publish-please": "2.4.1",
-    "reflect-metadata": "0.1.12",
-    "run-sequence": "2.2.1",
-    "sinon": "5.0.0",
-    "tslint": "5.9.1",
-    "typescript": "2.6.2",
-    "vinyl-source-stream": "2.0.0",
-    "vinyl-buffer": "1.0.1"
-  }
-}
+{
+  "name": "inversify",
+  "version": "4.14.0",
+  "description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.",
+  "main": "lib/inversify.js",
+  "jsnext:main": "es/inversify.js",
+  "types": "./dts/inversify.d.ts",
+  "directories": {
+    "test": "gulp"
+  },
+  "scripts": {
+    "test": "gulp",
+    "publish-please": "publish-please",
+    "prepublish": "publish-please guard"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/inversify/InversifyJS.git"
+  },
+  "keywords": [
+    "ioc",
+    "di",
+    "javascript",
+    "typescript",
+    "node",
+    "dependency injection",
+    "dependency inversion",
+    "inversion of control container"
+  ],
+  "author": "Remo H. Jansen",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/inversify/InversifyJS/issues"
+  },
+  "homepage": "http://inversify.io",
+  "engines": {},
+  "devDependencies": {
+    "@types/chai": "4.1.4",
+    "@types/harmony-proxy": "1.0.29",
+    "@types/mocha": "5.2.3",
+    "@types/sinon": "5.0.3",
+    "bluebird": "3.5.2",
+    "browserify": "16.2.3",
+    "chai": "4.1.2",
+    "del": "3.0.0",
+    "es6-symbol": "3.1.1",
+    "gulp": "3.9.1",
+    "gulp-istanbul": "1.1.3",
+    "gulp-mocha": "6.0.0",
+    "gulp-rename": "1.4.0",
+    "gulp-sourcemaps": "2.6.3",
+    "gulp-tslint": "8.1.3",
+    "gulp-typescript": "4.0.2",
+    "gulp-uglify": "3.0.1",
+    "harmonize": "2.0.0",
+    "harmony-proxy": "1.0.1",
+    "istanbul": "0.4.5",
+    "karma": "3.0.0",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "2.2.0",
+    "karma-commonjs": "1.0.0",
+    "karma-es6-shim": "1.0.0",
+    "karma-firefox-launcher": "1.1.0",
+    "karma-ie-launcher": "1.0.0",
+    "karma-mocha": "1.3.0",
+    "karma-mocha-reporter": "2.2.5",
+    "karma-phantomjs-launcher": "1.0.4",
+    "karma-sinon": "1.0.5",
+    "mocha": "5.2.0",
+    "performance-now": "2.1.0",
+    "publish-please": "4.0.1",
+    "reflect-metadata": "0.1.12",
+    "run-sequence": "2.2.1",
+    "sinon": "6.0.1",
+    "tslint": "5.9.1",
+    "typescript": "^2.8.3",
+    "vinyl-buffer": "1.0.1",
+    "vinyl-source-stream": "2.0.0"
+  }
+}

package/amd/utils/guid.js

@@ -1,14 +0,0 @@
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    function guid() {
-        function s4() {
-            return Math.floor((Math.random() + 1) * 0x10000)
-                .toString(16)
-                .substring(1);
-        }
-        return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-            s4() + "-" + s4() + s4() + s4();
-    }
-    exports.guid = guid;
-});

package/es/utils/guid.js

@@ -1,10 +0,0 @@
-function guid() {
-    function s4() {
-        return Math.floor((Math.random() + 1) * 0x10000)
-            .toString(16)
-            .substring(1);
-    }
-    return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-        s4() + "-" + s4() + s4() + s4();
-}
-export { guid };

package/lib/utils/guid.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function guid() {
-    function s4() {
-        return Math.floor((Math.random() + 1) * 0x10000)
-            .toString(16)
-            .substring(1);
-    }
-    return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-        s4() + "-" + s4() + s4() + s4();
-}
-exports.guid = guid;