awilix 6.0.0 → 6.1.0

package/README.md

@@ -47,7 +47,7 @@ written in [TypeScript](http://typescriptlang.org). **Make IoC great again!**
     - [`container.options`](#containeroptions)
     - [`container.resolve()`](#containerresolve)
     - [`container.register()`](#containerregister)
-    - [`container.has()`](#containerhas)
+    - [`container.hasRegistration()`](#containerhasregistration)
     - [`container.loadModules()`](#containerloadmodules)
     - [`container.createScope()`](#containercreatescope)
     - [`container.build()`](#containerbuild)
@@ -664,7 +664,7 @@ console.log(container.registrations.awesomeService.injectionMode) // 'CLASSIC'
 ```
 
 Additionally, if we add a `name` field and use `loadModules`, the `name` is used
-for registration.
+for registration (ignoring `formatName` if provided).
 
 ```diff
 // `RESOLVER` is a Symbol.
@@ -1042,9 +1042,9 @@ container.register('context', asClass(SessionContext).scoped())
 **The object syntax, key-value syntax and chaining are valid for all `register`
 calls!**
 
-### `container.has()`
+### `container.hasRegistration()`
 
-- `container.has(name: string | symbol): boolean`
+- `container.hasRegistration(name: string | symbol): boolean`
 
 Determines if the container has a registration with the given name. Also checks ancestor containers.
 

package/lib/awilix.browser.js

@@ -68,10 +68,14 @@ function __generator(thisArg, body) {
     }
 }
 
-function __spreadArray(to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 
 /**
@@ -139,7 +143,7 @@ var AwilixTypeError = /** @class */ (function (_super) {
      * Name of the given type.
      */
     function AwilixTypeError(funcDescription, paramName, expectedType, givenType) {
-        return _super.call(this, funcDescription + ": expected " + paramName + " to be " + expectedType + ", but got " + givenType + ".") || this;
+        return _super.call(this, "".concat(funcDescription, ": expected ").concat(paramName, " to be ").concat(expectedType, ", but got ").concat(givenType, ".")) || this;
     }
     /**
      * Asserts the given condition, throws an error otherwise.
@@ -192,12 +196,12 @@ var AwilixResolutionError = /** @class */ (function (_super) {
         });
         resolutionStack.push(name);
         var resolutionPathString = resolutionStack.join(' -> ');
-        var msg = "Could not resolve '" + name + "'.";
+        var msg = "Could not resolve '".concat(name, "'.");
         if (message) {
-            msg += " " + message;
+            msg += " ".concat(message);
         }
         msg += EOL + EOL;
-        msg += "Resolution path: " + resolutionPathString;
+        msg += "Resolution path: ".concat(resolutionPathString);
         _this = _super.call(this, msg) || this;
         return _this;
     }
@@ -700,7 +704,7 @@ function parseParameterList(source) {
      */
     /* istanbul ignore next */
     function unexpected() {
-        return new SyntaxError("Parsing parameter list, did not expect " + t.type + " token" + (t.value ? " (" + t.value + ")" : ''));
+        return new SyntaxError("Parsing parameter list, did not expect ".concat(t.type, " token").concat(t.value ? " (".concat(t.value, ")") : ''));
     }
 }
 
@@ -862,7 +866,7 @@ function makeOptions(defaults) {
     for (var _i = 1; _i < arguments.length; _i++) {
         rest[_i - 1] = arguments[_i];
     }
-    return Object.assign.apply(Object, __spreadArray([{}, defaults], rest));
+    return Object.assign.apply(Object, __spreadArray([{}, defaults], rest, false));
 }
 /**
  * Creates a new resolver with props merged from both.
@@ -900,7 +904,7 @@ function wrapWithLocals(container, locals) {
  */
 function createInjectorProxy(container, injector) {
     var locals = injector(container);
-    var allKeys = uniq(__spreadArray(__spreadArray([], Reflect.ownKeys(container.cradle), true), Reflect.ownKeys(locals)));
+    var allKeys = uniq(__spreadArray(__spreadArray([], Reflect.ownKeys(container.cradle), true), Reflect.ownKeys(locals), true));
     // TODO: Lots of duplication here from the container proxy.
     // Need to refactor.
     var proxy = new Proxy({}, {
@@ -1110,7 +1114,7 @@ function createContainer(options, parentContainer) {
          * @param  {string} name
          */
         set: function (_target, name) {
-            throw new Error("Attempted setting property \"" + name + "\" on container cradle - this is not allowed.");
+            throw new Error("Attempted setting property \"".concat(name, "\" on container cradle - this is not allowed."));
         },
         /**
          * Used for `Object.keys`.
@@ -1171,7 +1175,7 @@ function createContainer(options, parentContainer) {
      * Used by util.inspect (which is used by console.log).
      */
     function inspect() {
-        return "[AwilixContainer (" + (parentContainer ? 'scoped, ' : '') + "registrations: " + Object.keys(container.registrations).length + ")]";
+        return "[AwilixContainer (".concat(parentContainer ? 'scoped, ' : '', "registrations: ").concat(Object.keys(container.registrations).length, ")]");
     }
     /**
      * Rolls up registrations from the family tree.
@@ -1231,7 +1235,7 @@ function createContainer(options, parentContainer) {
      */
     function register(arg1, arg2) {
         var obj = nameValueToObject(arg1, arg2);
-        var keys = __spreadArray(__spreadArray([], Object.keys(obj), true), Object.getOwnPropertySymbols(obj));
+        var keys = __spreadArray(__spreadArray([], Object.keys(obj), true), Object.getOwnPropertySymbols(obj), true);
         for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
             var key = keys_1[_i];
             var value = obj[key];
@@ -1348,7 +1352,7 @@ function createContainer(options, parentContainer) {
                     container.cache.set(name, { resolver: resolver, value: resolved });
                     break;
                 default:
-                    throw new AwilixResolutionError(name, resolutionStack, "Unknown lifetime \"" + resolver.lifetime + "\"");
+                    throw new AwilixResolutionError(name, resolutionStack, "Unknown lifetime \"".concat(resolver.lifetime, "\""));
             }
             // Pop it from the stack again, ready for the next resolution
             resolutionStack.pop();

package/lib/awilix.module.js

@@ -1,4 +1,4 @@
-import * as glob from 'glob';
+import * as glob from 'fast-glob';
 import * as path from 'path';
 import * as util from 'util';
 import { pathToFileURL } from 'url';

package/lib/awilix.umd.js

@@ -74,10 +74,14 @@
         }
     }
 
-    function __spreadArray(to, from) {
-        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-            to[j] = from[i];
-        return to;
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || Array.prototype.slice.call(from));
     }
 
     /**
@@ -145,7 +149,7 @@
          * Name of the given type.
          */
         function AwilixTypeError(funcDescription, paramName, expectedType, givenType) {
-            return _super.call(this, funcDescription + ": expected " + paramName + " to be " + expectedType + ", but got " + givenType + ".") || this;
+            return _super.call(this, "".concat(funcDescription, ": expected ").concat(paramName, " to be ").concat(expectedType, ", but got ").concat(givenType, ".")) || this;
         }
         /**
          * Asserts the given condition, throws an error otherwise.
@@ -198,12 +202,12 @@
             });
             resolutionStack.push(name);
             var resolutionPathString = resolutionStack.join(' -> ');
-            var msg = "Could not resolve '" + name + "'.";
+            var msg = "Could not resolve '".concat(name, "'.");
             if (message) {
-                msg += " " + message;
+                msg += " ".concat(message);
             }
             msg += EOL + EOL;
-            msg += "Resolution path: " + resolutionPathString;
+            msg += "Resolution path: ".concat(resolutionPathString);
             _this = _super.call(this, msg) || this;
             return _this;
         }
@@ -706,7 +710,7 @@
          */
         /* istanbul ignore next */
         function unexpected() {
-            return new SyntaxError("Parsing parameter list, did not expect " + t.type + " token" + (t.value ? " (" + t.value + ")" : ''));
+            return new SyntaxError("Parsing parameter list, did not expect ".concat(t.type, " token").concat(t.value ? " (".concat(t.value, ")") : ''));
         }
     }
 
@@ -868,7 +872,7 @@
         for (var _i = 1; _i < arguments.length; _i++) {
             rest[_i - 1] = arguments[_i];
         }
-        return Object.assign.apply(Object, __spreadArray([{}, defaults], rest));
+        return Object.assign.apply(Object, __spreadArray([{}, defaults], rest, false));
     }
     /**
      * Creates a new resolver with props merged from both.
@@ -906,7 +910,7 @@
      */
     function createInjectorProxy(container, injector) {
         var locals = injector(container);
-        var allKeys = uniq(__spreadArray(__spreadArray([], Reflect.ownKeys(container.cradle), true), Reflect.ownKeys(locals)));
+        var allKeys = uniq(__spreadArray(__spreadArray([], Reflect.ownKeys(container.cradle), true), Reflect.ownKeys(locals), true));
         // TODO: Lots of duplication here from the container proxy.
         // Need to refactor.
         var proxy = new Proxy({}, {
@@ -1116,7 +1120,7 @@
              * @param  {string} name
              */
             set: function (_target, name) {
-                throw new Error("Attempted setting property \"" + name + "\" on container cradle - this is not allowed.");
+                throw new Error("Attempted setting property \"".concat(name, "\" on container cradle - this is not allowed."));
             },
             /**
              * Used for `Object.keys`.
@@ -1177,7 +1181,7 @@
          * Used by util.inspect (which is used by console.log).
          */
         function inspect() {
-            return "[AwilixContainer (" + (parentContainer ? 'scoped, ' : '') + "registrations: " + Object.keys(container.registrations).length + ")]";
+            return "[AwilixContainer (".concat(parentContainer ? 'scoped, ' : '', "registrations: ").concat(Object.keys(container.registrations).length, ")]");
         }
         /**
          * Rolls up registrations from the family tree.
@@ -1237,7 +1241,7 @@
          */
         function register(arg1, arg2) {
             var obj = nameValueToObject(arg1, arg2);
-            var keys = __spreadArray(__spreadArray([], Object.keys(obj), true), Object.getOwnPropertySymbols(obj));
+            var keys = __spreadArray(__spreadArray([], Object.keys(obj), true), Object.getOwnPropertySymbols(obj), true);
             for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
                 var key = keys_1[_i];
                 var value = obj[key];
@@ -1354,7 +1358,7 @@
                         container.cache.set(name, { resolver: resolver, value: resolved });
                         break;
                     default:
-                        throw new AwilixResolutionError(name, resolutionStack, "Unknown lifetime \"" + resolver.lifetime + "\"");
+                        throw new AwilixResolutionError(name, resolutionStack, "Unknown lifetime \"".concat(resolver.lifetime, "\""));
                 }
                 // Pop it from the stack again, ready for the next resolution
                 resolutionStack.pop();

package/lib/list-modules.d.ts

@@ -1,4 +1,4 @@
-import * as glob from 'glob';
+import * as glob from 'fast-glob';
 import { BuildResolverOptions } from './resolvers';
 import { LifetimeType } from './awilix';
 /**

package/lib/list-modules.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listModules = void 0;
-const glob = require("glob");
+const glob = require("fast-glob");
 const path = require("path");
 const utils_1 = require("./utils");
 // Regex to extract the module name.

package/lib/list-modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-modules.js","sourceRoot":"","sources":["../src/list-modules.ts"],"names":[],"mappings":";;;AAAA,6BAA4B;AAC5B,6BAA4B;AAC5B,mCAAiC;AAqCjC,oCAAoC;AACpC,MAAM,QAAQ,GAAG,WAAW,CAAA;AAE5B;;;;;;;;;;;;;;GAcG;AACH,SAAS,YAAY,CACnB,WAAqC,EACrC,IAAyB;IAEzB,IAAI,mBAAK,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAK,IAAI,CAAE,CAAA;IACvD,IAAI,WAAW,GAAgC,IAAI,CAAA;IACnD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC9B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAyB,CAAA;QACpD,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;KAC7B;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAK,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IACzD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;QACzC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAK,CAAC,GAAI,EAAE,CAAC,CAAC;QACjC,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC,CAAA;IACH,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,WAAW,CACzB,YAAsD,EACtD,IAAyB;IAEzB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC/B,OAAO,IAAA,eAAO,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;KAC/D;IAED,OAAO,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;AACzC,CAAC;AATD,kCASC"}
+{"version":3,"file":"list-modules.js","sourceRoot":"","sources":["../src/list-modules.ts"],"names":[],"mappings":";;;AAAA,kCAAiC;AACjC,6BAA4B;AAC5B,mCAAiC;AAqCjC,oCAAoC;AACpC,MAAM,QAAQ,GAAG,WAAW,CAAA;AAE5B;;;;;;;;;;;;;;GAcG;AACH,SAAS,YAAY,CACnB,WAAqC,EACrC,IAAyB;IAEzB,IAAI,mBAAK,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAK,IAAI,CAAE,CAAA;IACvD,IAAI,WAAW,GAAgC,IAAI,CAAA;IACnD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC9B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAyB,CAAA;QACpD,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;KAC7B;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAK,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IACzD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;QACzC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAK,CAAC,GAAI,EAAE,CAAC,CAAC;QACjC,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC,CAAA;IACH,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,WAAW,CACzB,YAAsD,EACtD,IAAyB;IAEzB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC/B,OAAO,IAAA,eAAO,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;KAC/D;IAED,OAAO,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;AACzC,CAAC;AATD,kCASC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awilix",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Extremely powerful dependency injection container.",
   "main": "lib/awilix.js",
   "module": "lib/awilix.module.js",
@@ -50,39 +50,38 @@
   },
   "homepage": "https://github.com/jeffijoe/awilix#readme",
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/runtime": "^7.16.0",
-    "@types/glob": "^7.2.0",
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.6",
-    "@types/prettier": "^2.4.1",
-    "babel-jest": "^27.3.1",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-transform-runtime": "^7.16.10",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/runtime": "^7.16.7",
+    "@types/jest": "^27.4.0",
+    "@types/node": "^17.0.13",
+    "@types/prettier": "^2.4.3",
+    "babel-jest": "^27.4.6",
     "coveralls": "^3.1.1",
     "husky": "^7.0.4",
     "istanbul": "^0.4.5",
-    "jest": "^27.3.1",
-    "lint-staged": "^11.2.6",
-    "prettier": "^2.4.1",
+    "jest": "^27.4.7",
+    "lint-staged": "^12.3.2",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.58.3",
+    "rollup": "^2.66.1",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-typescript2": "^0.30.0",
+    "rollup-plugin-typescript2": "^0.31.1",
     "smid": "^0.1.1",
-    "ts-jest": "^27.0.7",
+    "ts-jest": "^27.1.3",
     "tslib": "^2.3.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "^9.0.0",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.5"
   },
   "dependencies": {
     "camel-case": "^4.1.2",
-    "glob": "^7.2.0"
+    "fast-glob": "^3.2.11"
   },
   "lint-staged": {
     "*.ts": [