@decohere/crucible 0.0.1-dev.13 → 0.0.1-dev.130

package/commonjs/src/services/container.js

@@ -0,0 +1,207 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "Container", {
+    enumerable: true,
+    get: function() {
+        return Container;
+    }
+});
+const _reflection = require("@decohere/core/reflection");
+const _const = require("../const.js");
+const _servicekey = require("../models/service-key.js");
+const _errors = require("../types/errors.js");
+const _serviceregistry = require("./service-registry.js");
+function describePath(path, last) {
+    const keys = path.map((registration)=>registration.key);
+    return [
+        ...keys,
+        ...last == null ? [] : [
+            last
+        ]
+    ].map(_servicekey.describeKey).join(" → ");
+}
+class Container {
+    key;
+    instances = new Map();
+    serviceRegistry;
+    parent;
+    rootScope;
+    scopes = new Map();
+    isDisposed = false;
+    constructor(options){
+        this.key = options?.key;
+        this.serviceRegistry = new _serviceregistry.ServiceRegistry(options?.serviceRegistry);
+        this.registerLifetimeScope();
+        this.parent = options?.parent;
+        this.rootScope = options?.parent?.rootScope ?? this;
+    }
+    resolveMany(resolveRequest) {
+        return this.resolveAll(resolveRequest, []);
+    }
+    /** Throws {@link ResolveError} when nothing is registered for the key. */ resolve(resolveRequest) {
+        return this.resolveOne(resolveRequest, [], false);
+    }
+    resolveAll(key, path) {
+        const registrations = this.serviceRegistry.getRegistration(key) ?? [];
+        return registrations.map((registration)=>this.resolveRegistration(registration, path));
+    }
+    resolveOne(key, path, optional) {
+        const registrations = this.serviceRegistry.getRegistration(key);
+        if (registrations == null || registrations.length === 0) {
+            if (optional) return undefined;
+            const requiredBy = path.length === 0 ? "" : ` (required by ${describePath(path, key)})`;
+            throw new _errors.ResolveError(`Nothing is registered for ${(0, _servicekey.describeKey)(key)}${requiredBy}. Register it, or mark the parameter @optional().`);
+        }
+        if (registrations.length > 1) {
+            throw new _errors.ResolveError(`There are multiple services registered with key ${(0, _servicekey.describeKey)(key)}. Use resolveMany to resolve all implementations.`);
+        }
+        return this.resolveRegistration(registrations[0], path);
+    }
+    beginScope(name) {
+        if (this.isDisposed) {
+            throw new Error("This container has been disposed");
+        }
+        if (name != null && this.scopes.has(name)) {
+            throw new _errors.DuplicateScopeError(`Cannot create duplicate scope. Scope with ${name} is already created and has not been disposed.`);
+        }
+        const scope = new Container({
+            key: name,
+            serviceRegistry: this.serviceRegistry,
+            parent: this
+        });
+        if (name != null) {
+            this.scopes.set(name, scope);
+        }
+        return scope;
+    }
+    [Symbol.dispose]() {
+        if (this.isDisposed) {
+            return;
+        }
+        this.disposeSync();
+    }
+    async [Symbol.asyncDispose]() {
+        if (this.isDisposed) {
+            return;
+        }
+        await this.disposeAsync();
+    }
+    disposeSync() {
+        if (this.isDisposed) {
+            return;
+        }
+        this.isDisposed = true;
+        this.parent?.releaseScope(this.key);
+        this.scopes.clear();
+        // Reverse creation order: dependents are cleaned up before what they depend on.
+        for (const inst of [
+            ...this.instances.values()
+        ].reverse()){
+            if (inst === this) {
+                continue;
+            }
+            inst[Symbol.dispose]?.();
+        }
+    }
+    async disposeAsync() {
+        if (this.isDisposed) {
+            return;
+        }
+        this.isDisposed = true;
+        this.parent?.releaseScope(this.key);
+        this.scopes.clear();
+        // Reverse creation order: dependents are cleaned up before what they depend on.
+        for (const inst of [
+            ...this.instances.values()
+        ].reverse()){
+            if (inst === this) {
+                continue;
+            }
+            if (Symbol.asyncDispose in inst) {
+                await inst[Symbol.asyncDispose]();
+            } else {
+                inst[Symbol.dispose]?.();
+            }
+        }
+    }
+    resolveRegistration(registration, path) {
+        this.assertNoCycle(registration, path);
+        this.assertNotCaptive(registration, path);
+        const { scope } = registration;
+        switch(scope){
+            case _const.Scopes.transient:
+                return this.createInstance(registration, path);
+            case _const.Scopes.singleton:
+                return this.rootScope.getOrCreateInstance(registration, path);
+            case _const.Scopes.request:
+                return this.getOrCreateInstance(registration, path);
+        }
+    }
+    assertNoCycle(registration, path) {
+        if (!path.includes(registration)) return;
+        throw new _errors.ResolveError(`Circular dependency: ${describePath(path, registration.key)}. Break the cycle, e.g. by resolving one side lazily from the LifetimeScope.`);
+    }
+    /**
+	 * A singleton lives for the whole process, so a request-scoped service it depends on (directly
+	 * or through transients) would be created once and then shared by every request, e.g. one
+	 * QueryRunner for the life of the process. The container's own lifetime scope is exempt: a
+	 * singleton asking for it gets the root, which is the scope it lives in.
+	 */ assertNotCaptive(registration, path) {
+        if (registration.scope !== _const.Scopes.request || registration.key === _const.LifetimeScopeToken) return;
+        const singleton = path.find((owner)=>owner.scope === _const.Scopes.singleton);
+        if (singleton == null) return;
+        throw new _errors.ResolveError(`Singleton ${(0, _servicekey.describeKey)(singleton.key)} depends on request-scoped ${(0, _servicekey.describeKey)(registration.key)} (${describePath(path, registration.key)}). A singleton would keep the first request's instance forever: make ${(0, _servicekey.describeKey)(singleton.key)} request-scoped, or resolve ${(0, _servicekey.describeKey)(registration.key)} per request from the LifetimeScope.`);
+    }
+    getOrCreateInstance(registration, path) {
+        if (this.isDisposed) {
+            throw new Error("This container has been disposed");
+        }
+        const { type, isInstance } = registration;
+        // One cache entry per registration: an instance registration is its own entry.
+        const cacheKey = type;
+        const existingInstance = this.instances.get(cacheKey);
+        if (existingInstance != null) {
+            return existingInstance;
+        }
+        const instance = isInstance ? type : this.createInstance(registration, path);
+        this.instances.set(cacheKey, instance);
+        return instance;
+    }
+    createInstance(registration, path) {
+        const type = registration.type;
+        const canConstruct = (0, _reflection.isConstructable)(type);
+        const deps = this.resolveDependencies(type, [
+            ...path,
+            registration
+        ]);
+        const inst = canConstruct ? new type(...deps) : type();
+        return inst;
+    }
+    resolveDependencies(type, path) {
+        const params = (0, _reflection.getMeta)(_reflection.ReflectionMeta.paramtypes, type) ?? [];
+        const injectTokens = (0, _reflection.getMeta)(_const.ContainerMeta.injecttoken, type) ?? new Map();
+        return params.map((param, index)=>{
+            const token = injectTokens.get(index);
+            const key = token?.key ?? param;
+            if (key == null || key === Object || token?.key == null && (0, _reflection.isArrayType)(param)) {
+                if (token?.optional) return undefined;
+                throw new _errors.ResolveError(`Cannot tell what to inject for constructor parameter ${index} of ${describePath(path)}: its type is not a class at run time (an interface, an array, or a type-only import). Add @inject(token) to the parameter.`);
+            }
+            return (0, _reflection.isArrayType)(param) ? this.resolveAll(key, path) : this.resolveOne(key, path, token?.optional === true);
+        });
+    }
+    releaseScope(name) {
+        if (name == null) {
+            return;
+        }
+        this.scopes.delete(name);
+    }
+    registerLifetimeScope() {
+        this.serviceRegistry.replaceType(_const.Scopes.request, {
+            typeOrKey: _const.LifetimeScopeToken,
+            typeOrInstance: this
+        });
+    }
+}

package/commonjs/src/services/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_export_star(require("./crucible.js"), exports);
-_export_star(require("./crucible-builder.js"), exports);
+_export_star(require("./container.js"), exports);
+_export_star(require("./service-container-builder.js"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
@@ -17,5 +17,3 @@ function _export_star(from, to) {
     });
     return from;
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9zZXJ2aWNlcy9pbmRleC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9jcnVjaWJsZS5qc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vY3J1Y2libGUtYnVpbGRlci5qc1wiO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7cUJBQWM7cUJBQ0EifQ==

package/commonjs/src/services/service-container-builder.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ServiceContainerBuilder", {
+    enumerable: true,
+    get: function() {
+        return ServiceContainerBuilder;
+    }
+});
+const _const = require("../const.js");
+const _container = require("./container.js");
+const _serviceregistry = require("./service-registry.js");
+class ServiceContainerBuilder {
+    serviceRegistry;
+    constructor(options){
+        this.serviceRegistry = options?.serviceRegistry ?? new _serviceregistry.ServiceRegistry();
+    }
+    get override() {
+        return this.createRegistrar(true);
+    }
+    registerType(type, scope = _const.Scopes.transient) {
+        return this.register(false)(scope)(type, type);
+    }
+    registerTypes(scopeOrType, ...types) {
+        return this.registerMany(false, scopeOrType, types);
+    }
+    registerTransient(typeOrKey, type) {
+        return this.register(false)(_const.Scopes.transient)(typeOrKey, type);
+    }
+    registerSingleton(typeOrKey, typeOrInstance) {
+        return this.register(false)(_const.Scopes.singleton)(typeOrKey, typeOrInstance);
+    }
+    registerRequestScoped(typeOrKey, type) {
+        return this.register(false)(_const.Scopes.request)(typeOrKey, type);
+    }
+    build() {
+        return new _container.Container({
+            serviceRegistry: this.serviceRegistry
+        });
+    }
+    register = (override)=>(scope)=>(typeOrKey, typeOrInstance)=>this.serviceRegistry.registerType(scope, {
+                    typeOrKey,
+                    typeOrInstance,
+                    override
+                });
+    registerMany(override, scopeOrType, types) {
+        const bind = this.register(override);
+        const isScope = typeof scopeOrType !== "function";
+        const scope = isScope ? scopeOrType : _const.Scopes.transient;
+        const allTypes = isScope ? types : [
+            scopeOrType,
+            ...types
+        ];
+        return allTypes.map((type)=>bind(scope)(type, type));
+    }
+    createRegistrar(override) {
+        const bind = this.register(override);
+        return {
+            registerType: (type, scope = _const.Scopes.transient)=>bind(scope)(type, type),
+            registerTypes: (scopeOrType, ...types)=>this.registerMany(override, scopeOrType, types),
+            registerTransient: (typeOrKey, type)=>bind(_const.Scopes.transient)(typeOrKey, type),
+            registerSingleton: (typeOrKey, typeOrInstance)=>bind(_const.Scopes.singleton)(typeOrKey, typeOrInstance),
+            registerRequestScoped: (typeOrKey, type)=>bind(_const.Scopes.request)(typeOrKey, type)
+        };
+    }
+}

package/commonjs/src/services/service-registry.js

@@ -8,43 +8,50 @@ Object.defineProperty(exports, "ServiceRegistry", {
         return ServiceRegistry;
     }
 });
-const _registrationkeymodel = require("../models/registration-key.model.js");
+const _servicekey = require("../models/service-key.js");
 const _serviceregistrationmodel = require("../models/service-registration.model.js");
+const _errors = require("../types/errors.js");
 class ServiceRegistry {
-    registrations;
+    #registrations = new Map();
+    #parent;
     constructor(parent){
-        this.registrations = new Map(parent?.registrations);
+        this.#parent = parent;
     }
     registerType(scope, options) {
         const registration = this.createRegistrationFrom(scope, options);
-        const existingRegistration = this.getRegistrations(registration.key)?.filter((reg)=>!reg.isEqual(registration)) ?? [];
-        this.setRegistration(registration.key, [
-            registration,
-            ...existingRegistration
+        // Override means "this key now resolves to this", e.g. a test fake: replace every binding.
+        if (options.override) {
+            this.#registrations.set(registration.key, [
+                registration
+            ]);
+            return registration;
+        }
+        const existing = this.getRegistration(registration.key) ?? [];
+        const duplicate = existing.find((reg)=>reg.isEqual(registration));
+        if (duplicate != null) {
+            throw new _errors.RegistrationError(`A service is already registered for key ${(0, _servicekey.describeKey)(registration.key)}. Use builder.override.registerSingleton() (or the matching register* method) to replace it.`);
+        }
+        this.#registrations.set(registration.key, [
+            ...existing,
+            registration
         ]);
         return registration;
     }
-    getRegistration(key) {
-        const keyVal = new _registrationkeymodel.RegistrationKey(key).value;
-        const registration = this.registrations.get(keyVal);
+    replaceType(scope, options) {
+        const registration = this.createRegistrationFrom(scope, options);
+        this.#registrations.set(registration.key, [
+            registration
+        ]);
         return registration;
     }
+    getRegistration(key) {
+        return this.#registrations.get(key) ?? this.#parent?.getRegistration(key);
+    }
     createRegistrationFrom(scope, options) {
         const { typeOrKey, typeOrInstance } = options;
         const isKey = typeof typeOrKey === "string" || typeof typeOrKey === "symbol";
         const isInstance = typeof typeOrInstance === "object";
-        const key = new _registrationkeymodel.RegistrationKey(!isKey ? typeOrKey.name : typeOrKey);
         const type = isInstance ? typeOrInstance : isKey ? typeOrInstance : typeOrKey;
-        const registration = new _serviceregistrationmodel.ServiceRegistration(key, type, scope, isInstance);
-        return registration;
-    }
-    getRegistrations(key) {
-        const value = key.value;
-        return this.registrations.get(value);
-    }
-    setRegistration(key, registrations) {
-        this.registrations.set(key.value, registrations);
+        return new _serviceregistrationmodel.ServiceRegistration(typeOrKey, type, scope, isInstance);
     }
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9zZXJ2aWNlcy9zZXJ2aWNlLXJlZ2lzdHJ5LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgQ29uc3RydWN0YWJsZSwgRnVuY3Rpb25UeXBlIH0gZnJvbSBcIkBkZWNvaGVyZS9uZXh1cy9yZWZsZWN0aW9uXCI7XG5pbXBvcnQgeyBSZWdpc3RyYXRpb25LZXkgfSBmcm9tIFwiLi4vbW9kZWxzL3JlZ2lzdHJhdGlvbi1rZXkubW9kZWwuanNcIjtcbmltcG9ydCB7IFNlcnZpY2VSZWdpc3RyYXRpb24gfSBmcm9tIFwiLi4vbW9kZWxzL3NlcnZpY2UtcmVnaXN0cmF0aW9uLm1vZGVsLmpzXCI7XG5pbXBvcnQgdHlwZSB7IFNjb3BlIH0gZnJvbSBcIi4uL3R5cGVzL3R5cGVzLmpzXCI7XG5cbmV4cG9ydCB0eXBlIFJlZ2lzdGVyVHlwZU9wdGlvbnMgPSB7XG5cdHR5cGVPcktleTogc3RyaW5nIHwgc3ltYm9sIHwgQ29uc3RydWN0YWJsZSB8IEZ1bmN0aW9uVHlwZTtcblx0dHlwZU9ySW5zdGFuY2U/OiBDb25zdHJ1Y3RhYmxlIHwgRnVuY3Rpb25UeXBlIHwgb2JqZWN0O1xufTtcblxuZXhwb3J0IGNsYXNzIFNlcnZpY2VSZWdpc3RyeSB7XG5cdHByaXZhdGUgcmVhZG9ubHkgcmVnaXN0cmF0aW9uczogTWFwPHN0cmluZywgU2VydmljZVJlZ2lzdHJhdGlvbltdPjtcblx0cHVibGljIGNvbnN0cnVjdG9yKHBhcmVudD86IFNlcnZpY2VSZWdpc3RyeSkge1xuXHRcdHRoaXMucmVnaXN0cmF0aW9ucyA9IG5ldyBNYXAocGFyZW50Py5yZWdpc3RyYXRpb25zKTtcblx0fVxuXG5cdHB1YmxpYyByZWdpc3RlclR5cGUoc2NvcGU6IFNjb3BlLCBvcHRpb25zOiBSZWdpc3RlclR5cGVPcHRpb25zKSB7XG5cdFx0Y29uc3QgcmVnaXN0cmF0aW9uID0gdGhpcy5jcmVhdGVSZWdpc3RyYXRpb25Gcm9tKHNjb3BlLCBvcHRpb25zKTtcblx0XHRjb25zdCBleGlzdGluZ1JlZ2lzdHJhdGlvbiA9XG5cdFx0XHR0aGlzLmdldFJlZ2lzdHJhdGlvbnMocmVnaXN0cmF0aW9uLmtleSk/LmZpbHRlcigocmVnKSA9PiAhcmVnLmlzRXF1YWwocmVnaXN0cmF0aW9uKSkgPz9cblx0XHRcdFtdO1xuXG5cdFx0dGhpcy5zZXRSZWdpc3RyYXRpb24ocmVnaXN0cmF0aW9uLmtleSwgW3JlZ2lzdHJhdGlvbiwgLi4uZXhpc3RpbmdSZWdpc3RyYXRpb25dKTtcblx0XHRyZXR1cm4gcmVnaXN0cmF0aW9uO1xuXHR9XG5cblx0cHVibGljIGdldFJlZ2lzdHJhdGlvbihrZXk6IHN0cmluZyB8IHN5bWJvbCB8IENvbnN0cnVjdGFibGUpOiBTZXJ2aWNlUmVnaXN0cmF0aW9uW10ge1xuXHRcdGNvbnN0IGtleVZhbCA9IG5ldyBSZWdpc3RyYXRpb25LZXkoa2V5KS52YWx1ZTtcblx0XHRjb25zdCByZWdpc3RyYXRpb24gPSB0aGlzLnJlZ2lzdHJhdGlvbnMuZ2V0KGtleVZhbCk7XG5cdFx0cmV0dXJuIHJlZ2lzdHJhdGlvbjtcblx0fVxuXG5cdHByaXZhdGUgY3JlYXRlUmVnaXN0cmF0aW9uRnJvbShzY29wZTogU2NvcGUsIG9wdGlvbnM6IFJlZ2lzdGVyVHlwZU9wdGlvbnMpIHtcblx0XHRjb25zdCB7IHR5cGVPcktleSwgdHlwZU9ySW5zdGFuY2UgfSA9IG9wdGlvbnM7XG5cdFx0Y29uc3QgaXNLZXkgPSB0eXBlb2YgdHlwZU9yS2V5ID09PSBcInN0cmluZ1wiIHx8IHR5cGVvZiB0eXBlT3JLZXkgPT09IFwic3ltYm9sXCI7XG5cdFx0Y29uc3QgaXNJbnN0YW5jZSA9IHR5cGVvZiB0eXBlT3JJbnN0YW5jZSA9PT0gXCJvYmplY3RcIjtcblx0XHRjb25zdCBrZXkgPSBuZXcgUmVnaXN0cmF0aW9uS2V5KCFpc0tleSA/IHR5cGVPcktleS5uYW1lIDogdHlwZU9yS2V5KTtcblx0XHRjb25zdCB0eXBlID0gaXNJbnN0YW5jZSA/IHR5cGVPckluc3RhbmNlIDogaXNLZXkgPyB0eXBlT3JJbnN0YW5jZSA6IHR5cGVPcktleTtcblx0XHRjb25zdCByZWdpc3RyYXRpb24gPSBuZXcgU2VydmljZVJlZ2lzdHJhdGlvbihrZXksIHR5cGUsIHNjb3BlLCBpc0luc3RhbmNlKTtcblx0XHRyZXR1cm4gcmVnaXN0cmF0aW9uO1xuXHR9XG5cblx0cHJpdmF0ZSBnZXRSZWdpc3RyYXRpb25zKGtleTogUmVnaXN0cmF0aW9uS2V5KSB7XG5cdFx0Y29uc3QgdmFsdWUgPSBrZXkudmFsdWU7XG5cdFx0cmV0dXJuIHRoaXMucmVnaXN0cmF0aW9ucy5nZXQodmFsdWUpO1xuXHR9XG5cblx0cHJpdmF0ZSBzZXRSZWdpc3RyYXRpb24oa2V5OiBSZWdpc3RyYXRpb25LZXksIHJlZ2lzdHJhdGlvbnM6IFNlcnZpY2VSZWdpc3RyYXRpb25bXSkge1xuXHRcdHRoaXMucmVnaXN0cmF0aW9ucy5zZXQoa2V5LnZhbHVlLCByZWdpc3RyYXRpb25zKTtcblx0fVxufVxuIl0sIm5hbWVzIjpbIlNlcnZpY2VSZWdpc3RyeSIsInJlZ2lzdHJhdGlvbnMiLCJwYXJlbnQiLCJNYXAiLCJyZWdpc3RlclR5cGUiLCJzY29wZSIsIm9wdGlvbnMiLCJyZWdpc3RyYXRpb24iLCJjcmVhdGVSZWdpc3RyYXRpb25Gcm9tIiwiZXhpc3RpbmdSZWdpc3RyYXRpb24iLCJnZXRSZWdpc3RyYXRpb25zIiwia2V5IiwiZmlsdGVyIiwicmVnIiwiaXNFcXVhbCIsInNldFJlZ2lzdHJhdGlvbiIsImdldFJlZ2lzdHJhdGlvbiIsImtleVZhbCIsIlJlZ2lzdHJhdGlvbktleSIsInZhbHVlIiwiZ2V0IiwidHlwZU9yS2V5IiwidHlwZU9ySW5zdGFuY2UiLCJpc0tleSIsImlzSW5zdGFuY2UiLCJuYW1lIiwidHlwZSIsIlNlcnZpY2VSZWdpc3RyYXRpb24iLCJzZXQiXSwibWFwcGluZ3MiOiI7Ozs7K0JBVWFBOzs7ZUFBQUE7OztzQ0FUbUI7MENBQ0k7QUFRN0IsTUFBTUE7SUFDS0MsY0FBa0Q7SUFDbkUsWUFBbUJDLE1BQXdCLENBQUU7UUFDNUMsSUFBSSxDQUFDRCxhQUFhLEdBQUcsSUFBSUUsSUFBSUQsUUFBUUQ7SUFDdEM7SUFFT0csYUFBYUMsS0FBWSxFQUFFQyxPQUE0QixFQUFFO1FBQy9ELE1BQU1DLGVBQWUsSUFBSSxDQUFDQyxzQkFBc0IsQ0FBQ0gsT0FBT0M7UUFDeEQsTUFBTUcsdUJBQ0wsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsYUFBYUksR0FBRyxHQUFHQyxPQUFPLENBQUNDLE1BQVEsQ0FBQ0EsSUFBSUMsT0FBTyxDQUFDUCxrQkFDdEUsRUFBRTtRQUVILElBQUksQ0FBQ1EsZUFBZSxDQUFDUixhQUFhSSxHQUFHLEVBQUU7WUFBQ0o7ZUFBaUJFO1NBQXFCO1FBQzlFLE9BQU9GO0lBQ1I7SUFFT1MsZ0JBQWdCTCxHQUFvQyxFQUF5QjtRQUNuRixNQUFNTSxTQUFTLElBQUlDLHFDQUFlLENBQUNQLEtBQUtRLEtBQUs7UUFDN0MsTUFBTVosZUFBZSxJQUFJLENBQUNOLGFBQWEsQ0FBQ21CLEdBQUcsQ0FBQ0g7UUFDNUMsT0FBT1Y7SUFDUjtJQUVRQyx1QkFBdUJILEtBQVksRUFBRUMsT0FBNEIsRUFBRTtRQUMxRSxNQUFNLEVBQUVlLFNBQVMsRUFBRUMsY0FBYyxFQUFFLEdBQUdoQjtRQUN0QyxNQUFNaUIsUUFBUSxPQUFPRixjQUFjLFlBQVksT0FBT0EsY0FBYztRQUNwRSxNQUFNRyxhQUFhLE9BQU9GLG1CQUFtQjtRQUM3QyxNQUFNWCxNQUFNLElBQUlPLHFDQUFlLENBQUMsQ0FBQ0ssUUFBUUYsVUFBVUksSUFBSSxHQUFHSjtRQUMxRCxNQUFNSyxPQUFPRixhQUFhRixpQkFBaUJDLFFBQVFELGlCQUFpQkQ7UUFDcEUsTUFBTWQsZUFBZSxJQUFJb0IsNkNBQW1CLENBQUNoQixLQUFLZSxNQUFNckIsT0FBT21CO1FBQy9ELE9BQU9qQjtJQUNSO0lBRVFHLGlCQUFpQkMsR0FBb0IsRUFBRTtRQUM5QyxNQUFNUSxRQUFRUixJQUFJUSxLQUFLO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDbEIsYUFBYSxDQUFDbUIsR0FBRyxDQUFDRDtJQUMvQjtJQUVRSixnQkFBZ0JKLEdBQW9CLEVBQUVWLGFBQW9DLEVBQUU7UUFDbkYsSUFBSSxDQUFDQSxhQUFhLENBQUMyQixHQUFHLENBQUNqQixJQUFJUSxLQUFLLEVBQUVsQjtJQUNuQztBQUNEIn0=

package/commonjs/src/types/errors.js

@@ -25,5 +25,3 @@ class DuplicateScopeError extends Error {
 }
 class RegistrationError extends Error {
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy90eXBlcy9lcnJvcnMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIFJlc29sdmVFcnJvciBleHRlbmRzIEVycm9yIHt9XG5leHBvcnQgY2xhc3MgRHVwbGljYXRlU2NvcGVFcnJvciBleHRlbmRzIEVycm9yIHt9XG5leHBvcnQgY2xhc3MgUmVnaXN0cmF0aW9uRXJyb3IgZXh0ZW5kcyBFcnJvciB7fVxuIl0sIm5hbWVzIjpbIkR1cGxpY2F0ZVNjb3BlRXJyb3IiLCJSZWdpc3RyYXRpb25FcnJvciIsIlJlc29sdmVFcnJvciIsIkVycm9yIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztRQUNhQTtlQUFBQTs7UUFDQUM7ZUFBQUE7O1FBRkFDO2VBQUFBOzs7QUFBTixNQUFNQSxxQkFBcUJDO0FBQU87QUFDbEMsTUFBTUgsNEJBQTRCRztBQUFPO0FBQ3pDLE1BQU1GLDBCQUEwQkU7QUFBTyJ9

package/commonjs/src/types/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+_export_star(require("./errors.js"), exports);
 _export_star(require("./types.js"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
@@ -16,5 +17,3 @@ function _export_star(from, to) {
     });
     return from;
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy90eXBlcy9pbmRleC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi90eXBlcy5qc1wiO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7cUJBQWMifQ==

package/commonjs/src/types/types.js

@@ -2,5 +2,3 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/es6/src/const.js

@@ -1,12 +1,10 @@
-const Crucible = "Crucible";
+const Container = "Container";
 export const LifetimeScopeToken = Symbol("LifetimeScope");
-export const CrucibleMeta = {
-    injecttoken: `${Crucible}:injecttoken`
+export const ContainerMeta = {
+    injecttoken: `${Container}:injecttoken`
 };
 export const Scopes = {
     request: "request",
     singleton: "single-instance",
     transient: "transient"
 };
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9jb25zdC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFNjb3BlIH0gZnJvbSBcIi4vdHlwZXMvdHlwZXMuanNcIjtcblxuY29uc3QgQ3J1Y2libGUgPSBcIkNydWNpYmxlXCI7XG50eXBlIENydWNpYmxlTWV0YSA9IFwiaW5qZWN0dG9rZW5cIjtcblxuZXhwb3J0IGNvbnN0IExpZmV0aW1lU2NvcGVUb2tlbiA9IFN5bWJvbChcIkxpZmV0aW1lU2NvcGVcIik7XG5cbmV4cG9ydCBjb25zdCBDcnVjaWJsZU1ldGEgPSB7XG5cdGluamVjdHRva2VuOiBgJHtDcnVjaWJsZX06aW5qZWN0dG9rZW5gLFxufSBzYXRpc2ZpZXMgUmVjb3JkPENydWNpYmxlTWV0YSwgc3RyaW5nPjtcblxuZXhwb3J0IGNvbnN0IFNjb3BlcyA9IHtcblx0cmVxdWVzdDogXCJyZXF1ZXN0XCIsXG5cdHNpbmdsZXRvbjogXCJzaW5nbGUtaW5zdGFuY2VcIixcblx0dHJhbnNpZW50OiBcInRyYW5zaWVudFwiLFxufSBzYXRpc2ZpZXMgUmVjb3JkPHN0cmluZywgU2NvcGU+O1xuIl0sIm5hbWVzIjpbIkNydWNpYmxlIiwiTGlmZXRpbWVTY29wZVRva2VuIiwiU3ltYm9sIiwiQ3J1Y2libGVNZXRhIiwiaW5qZWN0dG9rZW4iLCJTY29wZXMiLCJyZXF1ZXN0Iiwic2luZ2xldG9uIiwidHJhbnNpZW50Il0sIm1hcHBpbmdzIjoiQUFFQSxNQUFNQSxXQUFXO0FBR2pCLE9BQU8sTUFBTUMscUJBQXFCQyxPQUFPLGlCQUFpQjtBQUUxRCxPQUFPLE1BQU1DLGVBQWU7SUFDM0JDLGFBQWEsR0FBR0osU0FBUyxZQUFZLENBQUM7QUFDdkMsRUFBeUM7QUFFekMsT0FBTyxNQUFNSyxTQUFTO0lBQ3JCQyxTQUFTO0lBQ1RDLFdBQVc7SUFDWEMsV0FBVztBQUNaLEVBQWtDIn0=

package/es6/src/decorators/index.js

@@ -1,4 +1,2 @@
 export * from "./inject.decorator.js";
 export * from "./injectable.dectorator.js";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9kZWNvcmF0b3JzL2luZGV4LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gXCIuL2luamVjdC5kZWNvcmF0b3IuanNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2luamVjdGFibGUuZGVjdG9yYXRvci5qc1wiO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsd0JBQXdCO0FBQ3RDLGNBQWMsNkJBQTZCIn0=

package/es6/src/decorators/inject.decorator.js

@@ -1,17 +1,30 @@
-import { defineMeta, getMeta } from "@decohere/nexus/reflection";
-import { CrucibleMeta } from "../const.js";
-export function inject(key) {
-    return (target, _propertyKey, idx)=>{
-        const metadata = getExistingMeta(target);
-        metadata.set(idx, {
+import { defineMeta, getMeta } from "@decohere/core/reflection";
+import { ContainerMeta } from "../const.js";
+/**
+ * Bind a constructor parameter to a registration key. Keys match by identity: a class matches only
+ * itself (not a string of its name), and a symbol only itself. Prefer the class; use a symbol for an
+ * interface or several implementations. `@inject(SomeClass)` also keeps SomeClass's import, which
+ * a parameter used only as a type can lose (its run-time type then collapses to `Object`).
+ */ export function inject(key) {
+    return updateToken((token)=>({
+            ...token,
             key
-        });
-        defineMeta(CrucibleMeta.injecttoken, metadata, target);
-    };
+        }));
+}
+/**
+ * Mark a constructor parameter as optional: when nothing is registered for it, the container
+ * passes `undefined` (so a default value applies) instead of throwing.
+ */ export function optional() {
+    return updateToken((token)=>({
+            ...token,
+            optional: true
+        }));
 }
-function getExistingMeta(target) {
-    const meta = getMeta(CrucibleMeta.injecttoken, target) ?? new Map();
-    return meta;
+function updateToken(update) {
+    return (target, _propertyKey, idx)=>{
+        // Copy: the metadata can be inherited from a base class, which must not change.
+        const metadata = new Map(getMeta(ContainerMeta.injecttoken, target));
+        metadata.set(idx, update(metadata.get(idx)));
+        defineMeta(ContainerMeta.injecttoken, metadata, target);
+    };
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9kZWNvcmF0b3JzL2luamVjdC5kZWNvcmF0b3IudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVmaW5lTWV0YSwgZ2V0TWV0YSB9IGZyb20gXCJAZGVjb2hlcmUvbmV4dXMvcmVmbGVjdGlvblwiO1xuaW1wb3J0IHsgQ3J1Y2libGVNZXRhIH0gZnJvbSBcIi4uL2NvbnN0LmpzXCI7XG5cbmV4cG9ydCB0eXBlIEluamVjdGlvbk1ldGFkYXRhID0gTWFwPG51bWJlciwgSW5qZWN0aW9uVG9rZW4+O1xuXG5leHBvcnQgdHlwZSBJbmplY3Rpb25Ub2tlbiA9IHtcblx0a2V5OiBzdHJpbmcgfCBzeW1ib2w7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gaW5qZWN0KGtleTogc3RyaW5nIHwgc3ltYm9sKSB7XG5cdHJldHVybiAodGFyZ2V0OiBvYmplY3QsIF9wcm9wZXJ0eUtleTogc3RyaW5nIHwgc3ltYm9sIHwgdW5kZWZpbmVkLCBpZHg6IG51bWJlcikgPT4ge1xuXHRcdGNvbnN0IG1ldGFkYXRhID0gZ2V0RXhpc3RpbmdNZXRhKHRhcmdldCk7XG5cdFx0bWV0YWRhdGEuc2V0KGlkeCwgeyBrZXkgfSk7XG5cdFx0ZGVmaW5lTWV0YShDcnVjaWJsZU1ldGEuaW5qZWN0dG9rZW4sIG1ldGFkYXRhLCB0YXJnZXQpO1xuXHR9O1xufVxuXG5mdW5jdGlvbiBnZXRFeGlzdGluZ01ldGEodGFyZ2V0OiBvYmplY3QpIHtcblx0Y29uc3QgbWV0YSA9XG5cdFx0Z2V0TWV0YTxNYXA8bnVtYmVyLCBJbmplY3Rpb25Ub2tlbj4+KENydWNpYmxlTWV0YS5pbmplY3R0b2tlbiwgdGFyZ2V0KSA/P1xuXHRcdG5ldyBNYXA8bnVtYmVyLCBJbmplY3Rpb25Ub2tlbj4oKTtcblx0cmV0dXJuIG1ldGE7XG59XG4iXSwibmFtZXMiOlsiZGVmaW5lTWV0YSIsImdldE1ldGEiLCJDcnVjaWJsZU1ldGEiLCJpbmplY3QiLCJrZXkiLCJ0YXJnZXQiLCJfcHJvcGVydHlLZXkiLCJpZHgiLCJtZXRhZGF0YSIsImdldEV4aXN0aW5nTWV0YSIsInNldCIsImluamVjdHRva2VuIiwibWV0YSIsIk1hcCJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsVUFBVSxFQUFFQyxPQUFPLFFBQVEsNkJBQTZCO0FBQ2pFLFNBQVNDLFlBQVksUUFBUSxjQUFjO0FBUTNDLE9BQU8sU0FBU0MsT0FBT0MsR0FBb0I7SUFDMUMsT0FBTyxDQUFDQyxRQUFnQkMsY0FBMkNDO1FBQ2xFLE1BQU1DLFdBQVdDLGdCQUFnQko7UUFDakNHLFNBQVNFLEdBQUcsQ0FBQ0gsS0FBSztZQUFFSDtRQUFJO1FBQ3hCSixXQUFXRSxhQUFhUyxXQUFXLEVBQUVILFVBQVVIO0lBQ2hEO0FBQ0Q7QUFFQSxTQUFTSSxnQkFBZ0JKLE1BQWM7SUFDdEMsTUFBTU8sT0FDTFgsUUFBcUNDLGFBQWFTLFdBQVcsRUFBRU4sV0FDL0QsSUFBSVE7SUFDTCxPQUFPRDtBQUNSIn0=

package/es6/src/decorators/injectable.dectorator.js

@@ -2,5 +2,3 @@ export function injectable() {
     // no implementation for now. Just used to ensure reflect metadata is generated
     return ()=>{};
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9kZWNvcmF0b3JzL2luamVjdGFibGUuZGVjdG9yYXRvci50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gaW5qZWN0YWJsZSgpOiBDbGFzc0RlY29yYXRvciB7XG5cdC8vIG5vIGltcGxlbWVudGF0aW9uIGZvciBub3cuIEp1c3QgdXNlZCB0byBlbnN1cmUgcmVmbGVjdCBtZXRhZGF0YSBpcyBnZW5lcmF0ZWRcblx0cmV0dXJuICgpID0+IHt9O1xufVxuIl0sIm5hbWVzIjpbImluamVjdGFibGUiXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sU0FBU0E7SUFDZiwrRUFBK0U7SUFDL0UsT0FBTyxLQUFPO0FBQ2YifQ==

package/es6/src/index.js

@@ -1,5 +1,3 @@
 export * from "./const.js";
 export * from "./services/index.js";
 export * from "./types/index.js";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9pbmRleC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9jb25zdC5qc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vc2VydmljZXMvaW5kZXguanNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3R5cGVzL2luZGV4LmpzXCI7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxhQUFhO0FBQzNCLGNBQWMsc0JBQXNCO0FBQ3BDLGNBQWMsbUJBQW1CIn0=

package/es6/src/models/service-key.js

@@ -0,0 +1,10 @@
+/** A readable name for a key, for error messages. */ export function describeKey(key) {
+    switch(typeof key){
+        case "string":
+            return `"${key}"`;
+        case "symbol":
+            return key.toString();
+        default:
+            return key.name || "(anonymous factory)";
+    }
+}

package/es6/src/models/service-registration.model.js

@@ -9,12 +9,7 @@ export class ServiceRegistration {
         this.scope = scope;
         this.isInstance = isInstance;
     }
-    isEqual(other) {
-        if (other.isInstance) {
-            return false;
-        }
+    /** Same class, or the same instance object. */ isEqual(other) {
         return this.type === other.type;
     }
 }
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL3J1bm5lci93b3JrL2RlY29oZXJlL2RlY29oZXJlL3Byb2plY3RzL2NydWNpYmxlL3NyYy9tb2RlbHMvc2VydmljZS1yZWdpc3RyYXRpb24ubW9kZWwudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBDb25zdHJ1Y3RhYmxlLCBGdW5jdGlvblR5cGUgfSBmcm9tIFwiQGRlY29oZXJlL25leHVzL3JlZmxlY3Rpb25cIjtcbmltcG9ydCB0eXBlIHsgU2NvcGUgfSBmcm9tIFwiLi4vdHlwZXMvdHlwZXMuanNcIjtcbmltcG9ydCB0eXBlIHsgUmVnaXN0cmF0aW9uS2V5IH0gZnJvbSBcIi4vcmVnaXN0cmF0aW9uLWtleS5tb2RlbC5qc1wiO1xuXG5leHBvcnQgY2xhc3MgU2VydmljZVJlZ2lzdHJhdGlvbiB7XG5cdHB1YmxpYyBrZXk6IFJlZ2lzdHJhdGlvbktleTtcblx0cHVibGljIHNjb3BlOiBTY29wZTtcblx0cHVibGljIHR5cGU6IENvbnN0cnVjdGFibGUgfCBGdW5jdGlvblR5cGUgfCBvYmplY3Q7XG5cdHB1YmxpYyBpc0luc3RhbmNlOiBib29sZWFuO1xuXG5cdHB1YmxpYyBjb25zdHJ1Y3Rvcihcblx0XHRrZXk6IFJlZ2lzdHJhdGlvbktleSxcblx0XHR0eXBlOiBDb25zdHJ1Y3RhYmxlIHwgRnVuY3Rpb25UeXBlIHwgb2JqZWN0LFxuXHRcdHNjb3BlOiBTY29wZSxcblx0XHRpc0luc3RhbmNlOiBib29sZWFuLFxuXHQpIHtcblx0XHR0aGlzLmtleSA9IGtleTtcblx0XHR0aGlzLnR5cGUgPSB0eXBlO1xuXHRcdHRoaXMuc2NvcGUgPSBzY29wZTtcblx0XHR0aGlzLmlzSW5zdGFuY2UgPSBpc0luc3RhbmNlO1xuXHR9XG5cblx0cHVibGljIGlzRXF1YWwob3RoZXI6IFNlcnZpY2VSZWdpc3RyYXRpb24pIHtcblx0XHRpZiAob3RoZXIuaXNJbnN0YW5jZSkge1xuXHRcdFx0cmV0dXJuIGZhbHNlO1xuXHRcdH1cblxuXHRcdHJldHVybiB0aGlzLnR5cGUgPT09IG90aGVyLnR5cGU7XG5cdH1cbn1cbiJdLCJuYW1lcyI6WyJTZXJ2aWNlUmVnaXN0cmF0aW9uIiwia2V5Iiwic2NvcGUiLCJ0eXBlIiwiaXNJbnN0YW5jZSIsImlzRXF1YWwiLCJvdGhlciJdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxNQUFNQTtJQUNMQyxJQUFxQjtJQUNyQkMsTUFBYTtJQUNiQyxLQUE0QztJQUM1Q0MsV0FBb0I7SUFFM0IsWUFDQ0gsR0FBb0IsRUFDcEJFLElBQTJDLEVBQzNDRCxLQUFZLEVBQ1pFLFVBQW1CLENBQ2xCO1FBQ0QsSUFBSSxDQUFDSCxHQUFHLEdBQUdBO1FBQ1gsSUFBSSxDQUFDRSxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDRCxLQUFLLEdBQUdBO1FBQ2IsSUFBSSxDQUFDRSxVQUFVLEdBQUdBO0lBQ25CO0lBRU9DLFFBQVFDLEtBQTBCLEVBQUU7UUFDMUMsSUFBSUEsTUFBTUYsVUFBVSxFQUFFO1lBQ3JCLE9BQU87UUFDUjtRQUVBLE9BQU8sSUFBSSxDQUFDRCxJQUFJLEtBQUtHLE1BQU1ILElBQUk7SUFDaEM7QUFDRCJ9