@venizia/ignis-inversion 0.2.0-9 → 0.2.1-0

package/LICENSE.md

@@ -72,7 +72,6 @@ Ignis uses the following open-source libraries. We are grateful to the authors a
 
 | Library | License | Description |
 |---------|---------|-------------|
-| [Lodash](https://github.com/lodash/lodash) | MIT | Utility library |
 | [reflect-metadata](https://github.com/rbuckton/reflect-metadata) | Apache-2.0 | Metadata reflection API |
 
 ### Documentation Dependencies

package/README.md

@@ -1,47 +1,23 @@
-<div align="center">
+# @venizia/ignis-inversion
 
-<br />
-
-# :fire: @venizia/ignis-inversion
-
-**A small IoC container that works anywhere.**
-
-[![Docs](https://img.shields.io/badge/Docs-ignis.venizia.ai-2563EB.svg?style=flat-square)](https://ignis.venizia.ai/references/base/dependency-injection)
-[![npm](https://img.shields.io/npm/v/@venizia/ignis-inversion.svg?style=flat-square&color=cb3837&label=@venizia/ignis-inversion)](https://www.npmjs.com/package/@venizia/ignis-inversion)
-[![License: MIT](https://img.shields.io/badge/License-MIT-3DA639.svg?style=flat-square)](https://opensource.org/licenses/MIT)
-[![TypeScript](https://img.shields.io/badge/TypeScript-6.x-3178C6.svg?style=flat-square&logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
-
-[Documentation](https://ignis.venizia.ai/references/base/dependency-injection) &#8226;
-[Core API](https://ignis.venizia.ai/references/) &#8226;
-[Changelog](https://ignis.venizia.ai/changelogs/)
-
-</div>
-
----
-
-The dependency injection container behind [IGNIS](https://ignis.venizia.ai) - decorator-driven
-constructor and property injection, a fluent binding API, singleton/transient scopes, and tag-based
-discovery, in roughly 350 lines.
-
-It has no framework dependency. Reach for it when you want LoopBack 4-style DI without adopting a
-framework, and it is small enough to ship into a browser bundle. IGNIS itself uses nothing more than
-what is documented here.
+The dependency injection container under IGNIS, and the error type every IGNIS package throws. It
+depends on no other IGNIS package, so you can install it alone to get LoopBack 4-style bindings
+without the framework.
 
 ## Install
 
 ```bash
-bun add @venizia/ignis-inversion reflect-metadata
+bun add @venizia/ignis-inversion
 ```
 
-> [!IMPORTANT]
-> `experimentalDecorators` and `emitDecoratorMetadata` must be `true` in your `tsconfig.json`,
-> declared **inline**. Bun does not resolve them through `extends`, and `@inject` is silently
-> dropped without them.
+`reflect-metadata` comes as a dependency, and the package entry imports it. Your `tsconfig.json`
+must declare `experimentalDecorators: true` itself (see [Decorators](#decorators)).
 
-## Usage
+## Use it
+
+Bind values and classes under string keys, then ask the container for a key.
 
 ```typescript
-import 'reflect-metadata';
 import { BindingScopes, Container, inject } from '@venizia/ignis-inversion';
 
 class GreetingService {
@@ -55,7 +31,7 @@ class GreetingService {
   }
 }
 
-const container = new Container({ scope: 'app' });
+const container = new Container();
 
 container.bind({ key: 'config.prefix' }).toValue('Hello');
 container
@@ -66,119 +42,109 @@ container
 const service = container.get<GreetingService>({ key: 'services.GreetingService' });
 console.log(service.greet('IGNIS')); // Hello IGNIS (en)
 
-// A key's first segment becomes a tag, so bindings are discoverable as a group.
-container.findByTag({ tag: 'services' }); // [Binding('services.GreetingService')]
+// The first segment of a dotted key becomes a tag.
+container.findByTag({ tag: 'services' }); // [the 'services.GreetingService' binding]
 ```
 
-## API
+Notice that `config.locale` is never bound. `isOptional: true` makes it resolve to `undefined`
+instead of throwing.
 
-Every method takes an options object - `container.get({ key })`, never `container.get(key)`.
+## API
 
-### Container
+Every method takes an options object: `container.get({ key })`, never `container.get(key)`.
 
-| Member | What it does |
+| Container member | What it does |
 | :--- | :--- |
-| `new Container({ scope })` | The default container. `AbstractContainer` (contract) and `BaseContainer` (storage) are exported for custom implementations |
 | `bind<T>({ key })` | Creates and registers a `Binding`, returned for chaining |
-| `get<T>({ key, isOptional })` | Resolves a value. Throws when unbound unless `isOptional` is true |
-| `gets<T>({ bindings })` | Resolves several keys at once; every result is optional |
-| `getBinding<T>({ key })` | The binding itself, not its value. Accepts `{ namespace, key }` too |
-| `isBound({ key })` / `unbind({ key })` | Membership test / removal |
-| `set({ binding })` | Registers an externally constructed `Binding` under its own key |
-| `instantiate<T>(cls)` | Builds a class from its decorator metadata - `resolve(cls)` is an alias |
-| `findByTag({ tag, exclude })` | All bindings carrying a tag. `exclude` takes an array or a `Set` of keys |
-| `clear()` / `reset()` | Drops cached singleton instances / drops all bindings |
-
-### Binding
-
-| Member | What it does |
+| `get<T>({ key, isOptional })` | Resolves a key. Throws when the key is unbound, unless `isOptional` is `true`. `key` may also be `{ namespace, key }` |
+| `gets({ bindings })` | Resolves several keys; every entry is optional |
+| `getBinding({ key })`, `isBound({ key })`, `unbind({ key })`, `set({ binding })` | Read, test, remove, or register a `Binding` |
+| `instantiate(cls)` / `resolve(cls)` | Builds a class from its `@inject` metadata without binding it |
+| `findByTag({ tag, exclude })` | Every binding with a tag; `exclude` takes an array or a `Set` of keys |
+| `clear()` / `reset()` | Drops cached singletons / drops every binding |
+| `startResolutionCounting()`, `getResolutionCounts()`, `stopResolutionCounting()` | Counts how often each key is resolved, off by default |
+
+| Binding member | What it does |
 | :--- | :--- |
-| `.toValue(value)` | Binds a ready value - returned as-is |
-| `.toClass(Class)` | Binds a class, instantiated through the container on resolution |
-| `.toProvider(fn \| ProviderClass)` | Binds a factory `(container) => T`, or a class implementing `IProvider<T>` with a `value(container)` method |
-| `.setScope(scope)` / `.getScope()` | `BindingScopes.TRANSIENT` (default) or `BindingScopes.SINGLETON` |
-| `.setTags(...tags)` / `.hasTag(tag)` / `.getTags()` | Tagging for `findByTag` |
-| `.getValue(container)` | Resolves the binding; a container is required for class and provider resolvers |
-| `.clearCache()` | Discards a cached singleton instance |
+| `toValue(value)` | Returns the value as-is |
+| `toClass(Class)` | Instantiates the class through the container |
+| `toProvider(factory)` | Calls `(container) => T`, or instantiates a class with a `value(container)` method |
+| `setScope(scope)` | `BindingScopes.TRANSIENT` (default) or `BindingScopes.SINGLETON` |
+| `setTags(...tags)`, `hasTag(tag)`, `getTags()` | Tags for `findByTag` |
+| `clearCache()` | Discards the cached singleton |
 
-### Decorators
+`AbstractContainer` (the contract) and `BaseContainer` (the storage) are exported for custom
+containers. `BindingKeys.build({ namespace, key })` joins a namespace and a key with a dot.
 
-| Decorator | Where | Notes |
-| :--- | :--- | :--- |
-| `@inject({ key, isOptional? })` | Constructor parameter | Resolved by index and passed to the constructor |
-| `@inject({ key, isOptional? })` | Property | Assigned after construction |
+## Decorators
 
-Both write into the shared `metadataRegistry` (a `MetadataRegistry` instance). Pass your own through
-the `registry` option to isolate metadata - in tests, for example.
+`@inject` marks a constructor parameter or a property. Pass a `key`, or a `target` class to
+resolve through the key that class was registered under.
 
-### Keys and scopes
+| Option | Type | Meaning |
+| :--- | :--- | :--- |
+| `key` | `string \| symbol` | The binding key to resolve |
+| `target` | class, or a function returning one | Resolve the class's recorded key. The function form survives an import cycle |
+| `isOptional` | `boolean` | Resolve an unbound key to `undefined` instead of throwing |
 
-| Symbol | Notes |
-| :--- | :--- |
-| `BindingKeys.build({ namespace, key })` | Joins the two with a dot. `key` is required; an empty namespace yields the bare key |
-| Namespace auto-tagging | A dotted key tags its binding with the first segment - `services.UserService` is tagged `services` |
-| `BindingScopes` | `SINGLETON`, `TRANSIENT` |
-| `BindingValueTypes` | `CLASS`, `VALUE`, `PROVIDER` - the resolver kinds |
+Constructor parameters resolve before construction. Properties are assigned after it.
 
-Conventional namespaces across IGNIS: `controllers`, `services`, `repositories`, `datasources`.
+> [!IMPORTANT]
+> Declare `experimentalDecorators: true` in your own `tsconfig.json`, not only through `extends`.
+> Bun can miss an inherited flag when it runs source, and then drops parameter decorators with no
+> error. `emitDecoratorMetadata` is not needed: `@inject` records the parameter index itself.
 
-Full reference: [Dependency injection](https://ignis.venizia.ai/references/base/dependency-injection).
+Decorate every constructor parameter of a class the container builds. An undecorated parameter
+before a decorated one is refused with `Constructor parameter N has no @inject`. An undecorated
+trailing parameter receives `undefined`.
 
 ## Errors
 
-This package also ships the error module the whole framework throws through, so a standalone
-consumer gets it for free. Never throw a raw `new Error`.
+The package also holds the error type the whole framework throws.
 
 ```typescript
 import { getError, isApplicationError } from '@venizia/ignis-inversion';
 
-throw getError({
-  message: { text: 'User not found', code: 'user.not_found', args: { id: 42 } },
-  statusCode: 404,
-});
+try {
+  throw getError({
+    message: { text: 'User not found', code: 'user.not_found', args: { id: 42 } },
+    statusCode: 404,
+  });
+} catch (error) {
+  if (isApplicationError(error)) {
+    console.log(error.statusCode, error.normalized); // 404 { text, code, args }
+  }
+}
 ```
 
-`getError` returns an `ApplicationError` - a real `Error` subclass carrying `statusCode`, an
-optional `extra` bag, and `normalized`, which is always the same three fields:
+`getError` returns an `ApplicationError`, an `Error` subclass. It carries `statusCode` (default
+`400`), `normalized` (`{ text, code, args }`) and an optional `extra` bag. A bare string `message`
+becomes `text`. A missing code becomes `MessageCode.DEFAULT` (`core.system_error`). Unknown
+top-level keys go into `extra`.
 
-| Field | Meaning |
-| :--- | :--- |
-| `text` | The human-readable message |
-| `code` | A dotted, lower snake_case message code. Falls back to `MessageCode.DEFAULT` (`core.system_error`) |
-| `args` | Interpolation arguments, `{}` when there are none |
-
-`message` also accepts a bare string, which becomes `text`. Unknown top-level keys are swept into
-`extra`, so a throw site can attach context the framework does not model.
-
-> [!IMPORTANT]
-> Check errors with `isApplicationError(error)`, never `instanceof ApplicationError`. Several
-> packages can carry their own copy of the class, so `instanceof` fails across package boundaries.
-
-Also exported: `ApplicationError`, `MessageCode`, `ErrorScopes`, and the `TError*` types. Catalogued
-errors are declared as `TErrorDefinition` objects and thrown with `getError({ error: Definition })`.
+Test with `isApplicationError(error)`, not `instanceof ApplicationError`. A CommonJS copy and an
+ES module copy of the package can both be loaded, and `instanceof` fails across them.
 
-## Rules that will burn you
+## Entry points
 
-**Every constructor parameter of a container-instantiated class must carry `@inject`.** There is no
-channel for the container to supply an undecorated one, so a mixed constructor is refused at
-instantiation with `[Class] Constructor parameter N has no @inject`. Options a class needs go into
-`super({ ... })` or onto a binding, never as a bare parameter.
+| Entry point | What it gives | Extra peers |
+| :--- | :--- | :--- |
+| `@venizia/ignis-inversion` | Everything: container, bindings, `@inject`, `MetadataRegistry`, errors | none |
 
-**This package keeps a dual CJS + ESM build on purpose.** Frontend consumers import it into browser
-bundles, so `dist/esm` is load-bearing. Do not "simplify" the build to ESM-only or CJS-only.
+The package ships both CommonJS (`dist/cjs`) and ES modules (`dist/esm`). `import` resolves the ES
+build, `require` the CommonJS one. The ES build is what a browser bundle takes.
 
-**`import 'reflect-metadata'` once, at your entrypoint.** The package imports it, but a consumer
-that loads two copies gets two metadata stores and silently empty injection.
+## Where it sits
 
-**Singleton caching keys on `undefined`.** A singleton binding that resolves to `undefined` is
-re-resolved on every `get` rather than cached.
+Depends on nothing in IGNIS. Used by filter, helpers and kernel: dev-configs -> **inversion** ->
+{filter, helpers} -> {boot, kernel} -> connectors -> {core-worker, core-server} -> atlas.
 
 ## Links
 
-[Documentation](https://ignis.venizia.ai) &#8226;
-[Dependency injection](https://ignis.venizia.ai/references/base/dependency-injection) &#8226;
-[Core API](https://ignis.venizia.ai/references/) &#8226;
-[Best practices](https://ignis.venizia.ai/best-practices/) &#8226;
-[Changelog](https://ignis.venizia.ai/changelogs/)
+- [Inversion (DI) guide](https://ignis.venizia.ai/extensions/helpers/inversion/)
+- [Dependency injection reference](https://ignis.venizia.ai/references/base/dependency-injection)
+- [Error handling](https://ignis.venizia.ai/extensions/helpers/error/)
+- [Changelog](https://ignis.venizia.ai/changelogs/)
+- [Source](https://github.com/VENIZIA-AI/ignis/blob/main/packages/inversion)
 
-MIT licensed. Questions: [GitHub Issues](https://github.com/VENIZIA-AI/ignis/issues) &#8226; developer@venizia.ai
+MIT licensed - see [LICENSE.md](./LICENSE.md).

package/dist/cjs/common/utilities.d.ts

@@ -1,10 +1,38 @@
 import type { AnyType, TClass, TInjectTarget, TValueOrAsyncResolver, TValueOrResolver } from './types';
+/**
+ * True for a value carrying nothing: `null`/`undefined`, an empty string, array, `Map`, `Set`, or an
+ * object with no own enumerable keys. A number, boolean or function is empty too - it holds no
+ * entries.
+ *
+ * Hand-written rather than `lodash/isEmpty`, and NOT a plain `!value`: `!{}` is `false` while an
+ * empty object IS empty, so the two disagree on exactly the case a swap would silently flip.
+ */
+export declare const isEmpty: (opts: {
+    value: unknown;
+}) => boolean;
+/**
+ * A shallow copy without `keys`.
+ *
+ * Hand-written rather than `lodash/omit`: this package is bundled for browsers, where importing
+ * lodash for one function costs 24 KB. Matches lodash on the shapes we pass it - a flat key list,
+ * never a nested path.
+ */
+export declare const omit: <T extends object, K extends PropertyKey>(opts: {
+    source: T;
+    keys: readonly K[];
+}) => Omit<T, Extract<K, keyof T>>;
 /** Tells a CONSTRUCTOR from a RESOLVER via source text - `prototype !== undefined` is true of every non-arrow function. Sound only on ES2020+ output (classes emit as `class`); ES5 bundling breaks it. */
 export declare const isClass: <T>(target: any) => target is TClass<T>;
 /** Reads a value-or-resolver. A class constructor is returned as-is; only a plain function is called. */
-export declare const resolveValue: <T>(valueOrResolver: TValueOrResolver<T>) => T;
+export declare const resolveValue: <T>(opts: {
+    value: TValueOrResolver<T>;
+}) => T;
 /** `resolveValue` for a resolver that may answer a promise. */
-export declare const resolveValueAsync: <T>(valueOrResolver: TValueOrAsyncResolver<T>) => Promise<T>;
+export declare const resolveValueAsync: <T>(opts: {
+    value: TValueOrAsyncResolver<T>;
+}) => Promise<T>;
 /** Reads what `@inject({ target })` named. The function form is called HERE, never at decoration: that is what lets a class reached through an import cycle be named at all. Answers `undefined` when the function hands back something that is not a class. The container resolves synchronously, so there is no async form. */
-export declare const resolveInjectTarget: (target: TInjectTarget) => TClass<AnyType> | undefined;
+export declare const resolveInjectTarget: (opts: {
+    target: TInjectTarget;
+}) => TClass<AnyType> | undefined;
 //# sourceMappingURL=utilities.d.ts.map

package/dist/cjs/common/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../src/common/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAEP,MAAM,EACN,aAAa,EAEb,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,2MAA2M;AAC3M,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,QAAQ,GAAG,KAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAM1D,CAAC;AAMF,yGAAyG;AACzG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,iBAAiB,gBAAgB,CAAC,CAAC,CAAC,KAAG,CACJ,CAAC;AAOpE,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB,GAAU,CAAC,EACvC,iBAAiB,qBAAqB,CAAC,CAAC,CAAC,KACxC,OAAO,CAAC,CAAC,CAA6E,CAAC;AAE1F,iUAAiU;AACjU,eAAO,MAAM,mBAAmB,GAAI,QAAQ,aAAa,KAAG,MAAM,CAAC,OAAO,CAAC,GAAG,SAG7E,CAAC"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../src/common/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAEP,MAAM,EACN,aAAa,EAEb,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,OAwBlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,WAAW,EAAE,MAAM;IAClE,MAAM,EAAE,CAAC,CAAC;IACV,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;CACpB,KAAG,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAe9B,CAAC;AAEF,2MAA2M;AAC3M,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,QAAQ,GAAG,KAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAM1D,CAAC;AAMF,yGAAyG;AACzG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,MAAM;IAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;CAAE,KAAG,CAGtE,CAAC;AAOF,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB,GAAU,CAAC,EAAE,MAAM;IAC/C,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;CACjC,KAAG,OAAO,CAAC,CAAC,CAGZ,CAAC;AAEF,iUAAiU;AACjU,eAAO,MAAM,mBAAmB,GAAI,MAAM;IACxC,MAAM,EAAE,aAAa,CAAC;CACvB,KAAG,MAAM,CAAC,OAAO,CAAC,GAAG,SAGrB,CAAC"}

package/dist/cjs/common/utilities.js

@@ -1,6 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveInjectTarget = exports.resolveValueAsync = exports.resolveValue = exports.isClass = void 0;
+exports.resolveInjectTarget = exports.resolveValueAsync = exports.resolveValue = exports.isClass = exports.omit = exports.isEmpty = void 0;
+/**
+ * True for a value carrying nothing: `null`/`undefined`, an empty string, array, `Map`, `Set`, or an
+ * object with no own enumerable keys. A number, boolean or function is empty too - it holds no
+ * entries.
+ *
+ * Hand-written rather than `lodash/isEmpty`, and NOT a plain `!value`: `!{}` is `false` while an
+ * empty object IS empty, so the two disagree on exactly the case a swap would silently flip.
+ */
+const isEmpty = (opts) => {
+    const { value } = opts;
+    if (value === null || value === undefined) {
+        return true;
+    }
+    // The types that carry a MEANINGFUL length. Duck-typing on `.length` instead would call
+    // `{ length: 0 }` empty, which it is not - it has an own key.
+    if (typeof value === 'string' || Array.isArray(value) || ArrayBuffer.isView(value)) {
+        return value.length === 0;
+    }
+    if (value instanceof Map || value instanceof Set) {
+        return value.size === 0;
+    }
+    if (typeof value !== 'object') {
+        return true;
+    }
+    // Own keys only: `for...in` would walk the prototype chain and call an object with an inherited
+    // property non-empty.
+    return Object.keys(value).length === 0;
+};
+exports.isEmpty = isEmpty;
+/**
+ * A shallow copy without `keys`.
+ *
+ * Hand-written rather than `lodash/omit`: this package is bundled for browsers, where importing
+ * lodash for one function costs 24 KB. Matches lodash on the shapes we pass it - a flat key list,
+ * never a nested path.
+ */
+const omit = (opts) => {
+    const { source, keys } = opts;
+    const dropped = new Set(keys);
+    const kept = {};
+    const entries = Object.entries(source);
+    for (const [key, value] of entries) {
+        if (dropped.has(key)) {
+            continue;
+        }
+        kept[key] = value;
+    }
+    return kept;
+};
+exports.omit = omit;
 /** Tells a CONSTRUCTOR from a RESOLVER via source text - `prototype !== undefined` is true of every non-arrow function. Sound only on ES2020+ output (classes emit as `class`); ES5 bundling breaks it. */
 const isClass = (target) => {
     if (typeof target !== 'function' || target.prototype === undefined) {
@@ -12,15 +62,21 @@ exports.isClass = isClass;
 /** A resolver is anything callable that is not a class - a class is a value here, never a factory. */
 const isResolver = (valueOrResolver) => typeof valueOrResolver === 'function' && !(0, exports.isClass)(valueOrResolver);
 /** Reads a value-or-resolver. A class constructor is returned as-is; only a plain function is called. */
-const resolveValue = (valueOrResolver) => isResolver(valueOrResolver) ? valueOrResolver() : valueOrResolver;
+const resolveValue = (opts) => {
+    const { value } = opts;
+    return isResolver(value) ? value() : value;
+};
 exports.resolveValue = resolveValue;
 const isAsyncResolver = (valueOrResolver) => typeof valueOrResolver === 'function' && !(0, exports.isClass)(valueOrResolver);
 /** `resolveValue` for a resolver that may answer a promise. */
-const resolveValueAsync = async (valueOrResolver) => (isAsyncResolver(valueOrResolver) ? valueOrResolver() : valueOrResolver);
+const resolveValueAsync = async (opts) => {
+    const { value } = opts;
+    return isAsyncResolver(value) ? value() : value;
+};
 exports.resolveValueAsync = resolveValueAsync;
 /** Reads what `@inject({ target })` named. The function form is called HERE, never at decoration: that is what lets a class reached through an import cycle be named at all. Answers `undefined` when the function hands back something that is not a class. The container resolves synchronously, so there is no async form. */
-const resolveInjectTarget = (target) => {
-    const resolved = (0, exports.resolveValue)(target);
+const resolveInjectTarget = (opts) => {
+    const resolved = (0, exports.resolveValue)({ value: opts.target });
     return (0, exports.isClass)(resolved) ? resolved : undefined;
 };
 exports.resolveInjectTarget = resolveInjectTarget;

package/dist/cjs/common/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../src/common/utilities.ts"],"names":[],"mappings":";;;AAUA,2MAA2M;AACpM,MAAM,OAAO,GAAG,CAAI,MAAW,EAAuB,EAAE;IAC7D,IAAI,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AANW,QAAA,OAAO,WAMlB;AAEF,sGAAsG;AACtG,MAAM,UAAU,GAAG,CAAI,eAAoC,EAAmC,EAAE,CAC9F,OAAO,eAAe,KAAK,UAAU,IAAI,CAAC,IAAA,eAAO,EAAC,eAAe,CAAC,CAAC;AAErE,yGAAyG;AAClG,MAAM,YAAY,GAAG,CAAI,eAAoC,EAAK,EAAE,CACzE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;AADvD,QAAA,YAAY,gBAC2C;AAEpE,MAAM,eAAe,GAAG,CACtB,eAAyC,EACH,EAAE,CACxC,OAAO,eAAe,KAAK,UAAU,IAAI,CAAC,IAAA,eAAO,EAAC,eAAe,CAAC,CAAC;AAErE,+DAA+D;AACxD,MAAM,iBAAiB,GAAG,KAAK,EACpC,eAAyC,EAC7B,EAAE,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;AAF7E,QAAA,iBAAiB,qBAE4D;AAE1F,iUAAiU;AAC1T,MAAM,mBAAmB,GAAG,CAAC,MAAqB,EAA+B,EAAE;IACxF,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;IACtC,OAAO,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../src/common/utilities.ts"],"names":[],"mappings":"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"}

package/dist/cjs/modules/binding/binding.d.ts

@@ -7,6 +7,7 @@ export declare class Binding<T = any> extends BaseHelper implements IBinding<T>
     key: string;
     private bindScope;
     private tags;
+    /** Boxed: a singleton may legitimately be `null`, `false`, `0`, `''` or `undefined`. */
     private cached?;
     private resolver;
     constructor(opts: {
@@ -26,6 +27,8 @@ export declare class Binding<T = any> extends BaseHelper implements IBinding<T>
     hasTag(tag: string): boolean;
     getTags(): string[];
     getScope(): TBindingScope;
+    /** True when `getValue` answers without building anything: a cached singleton or a plain value. Nothing it reads can form a cycle. */
+    isSettled(): boolean;
     getValue(container?: IContainer): T;
     clearCache(): void;
 }

package/dist/cjs/modules/binding/binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binding.d.ts","sourceRoot":"","sources":["../../../../src/modules/binding/binding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAiB,iBAAiB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAmB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEpG,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,UAAW,YAAW,QAAQ,CAAC,CAAC,CAAC;IACrE,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,SAAS,CAA0C;IAC3D,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,MAAM,CAAC,CAAI;IAEnB,OAAO,CAAC,QAAQ,CAG4D;gBAEhE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE;WAajB,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAK/B,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAKvB,UAAU,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI;IAK5C,cAAc,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAU/F,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAKpC,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAKhC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,OAAO,IAAI,MAAM,EAAE;IAInB,QAAQ,IAAI,aAAa;IAIzB,QAAQ,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,CAAC;IAuDnC,UAAU;CAOX"}
+{"version":3,"file":"binding.d.ts","sourceRoot":"","sources":["../../../../src/modules/binding/binding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAiB,iBAAiB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAmB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEpG,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,UAAW,YAAW,QAAQ,CAAC,CAAC,CAAC;IACrE,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,SAAS,CAA0C;IAC3D,OAAO,CAAC,IAAI,CAAc;IAC1B,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,CAAe;IAE9B,OAAO,CAAC,QAAQ,CAG4D;gBAEhE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE;WAajB,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI;IAK/B,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAKvB,UAAU,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI;IAK5C,cAAc,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAU/F,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAKpC,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAKhC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,OAAO,IAAI,MAAM,EAAE;IAInB,QAAQ,IAAI,aAAa;IAIzB,sIAAsI;IACtI,SAAS,IAAI,OAAO;IAOpB,QAAQ,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,CAAC;IAuDnC,UAAU;CAGX"}

package/dist/cjs/modules/binding/binding.js

@@ -57,9 +57,14 @@ class Binding extends base_helper_1.BaseHelper {
     getScope() {
         return this.bindScope;
     }
+    /** True when `getValue` answers without building anything: a cached singleton or a plain value. Nothing it reads can form a cycle. */
+    isSettled() {
+        return ((this.bindScope === constants_1.BindingScopes.SINGLETON && this.cached !== undefined) ||
+            this.resolver.type === constants_1.BindingValueTypes.VALUE);
+    }
     getValue(container) {
-        if (this.bindScope === constants_1.BindingScopes.SINGLETON && this.cached !== undefined) {
-            return this.cached;
+        if (this.bindScope === constants_1.BindingScopes.SINGLETON && this.cached) {
+            return this.cached.value;
         }
         let instance;
         const { type: resolverType } = this.resolver;
@@ -99,14 +104,11 @@ class Binding extends base_helper_1.BaseHelper {
             }
         }
         if (this.bindScope === constants_1.BindingScopes.SINGLETON) {
-            this.cached = instance;
+            this.cached = { value: instance };
         }
         return instance;
     }
     clearCache() {
-        if (!this.cached) {
-            return;
-        }
         this.cached = undefined;
     }
 }

package/dist/cjs/modules/binding/binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/modules/binding/binding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../../../src/modules/binding/binding.ts"],"names":[],"mappings":"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"}

package/dist/cjs/modules/binding/common/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/modules/binding/common/constants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,SAAS,eAAe;IACxC,MAAM,CAAC,QAAQ,CAAC,SAAS,eAAe;CACzC;AACD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;AAE9D,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAAc;CACvC;AACD,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEtE,qBAAa,WAAW;IACtB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;CAgBtD"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/modules/binding/common/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,SAAS,eAAe;IACxC,MAAM,CAAC,QAAQ,CAAC,SAAS,eAAe;CACzC;AACD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;AAE9D,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAAc;CACvC;AACD,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEtE,qBAAa,WAAW;IACtB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;CAgBtD"}

package/dist/cjs/modules/binding/common/constants.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BindingKeys = exports.BindingValueTypes = exports.BindingScopes = void 0;
-const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const error_1 = require("../../error");
 class BindingScopes {
     static { this.SINGLETON = 'singleton'; }
@@ -21,10 +17,10 @@ class BindingKeys {
     static build(opts) {
         const { namespace, key } = opts;
         const keyParts = [];
-        if (!(0, isEmpty_1.default)(namespace)) {
+        if (namespace) {
             keyParts.push(namespace);
         }
-        if ((0, isEmpty_1.default)(key)) {
+        if (!key) {
             throw (0, error_1.getError)({
                 message: `[BindingKeys][build] Invalid key to build | key: ${key}`,
             });

package/dist/cjs/modules/binding/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/modules/binding/common/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAqC;AACrC,uCAAuC;AAGvC,MAAa,aAAa;aACR,cAAS,GAAG,WAAW,CAAC;aACxB,cAAS,GAAG,WAAW,CAAC;;AAF1C,sCAGC;AAGD,MAAa,iBAAiB;aACZ,UAAK,GAAG,OAAO,CAAC;aAChB,UAAK,GAAG,OAAO,CAAC;aAChB,aAAQ,GAAG,UAAU,CAAC;;AAHxC,8CAIC;AAGD,MAAa,WAAW;IACtB,MAAM,CAAC,KAAK,CAAC,IAAwC;QACnD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAkB,EAAE,CAAC;QACnC,IAAI,CAAC,IAAA,iBAAO,EAAC,SAAS,CAAC,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,IAAA,iBAAO,EAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,IAAA,gBAAQ,EAAC;gBACb,OAAO,EAAE,oDAAoD,GAAG,EAAE;aACnE,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;CACF;AAjBD,kCAiBC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/modules/binding/common/constants.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAGvC,MAAa,aAAa;aACR,cAAS,GAAG,WAAW,CAAC;aACxB,cAAS,GAAG,WAAW,CAAC;;AAF1C,sCAGC;AAGD,MAAa,iBAAiB;aACZ,UAAK,GAAG,OAAO,CAAC;aAChB,UAAK,GAAG,OAAO,CAAC;aAChB,aAAQ,GAAG,UAAU,CAAC;;AAHxC,8CAIC;AAGD,MAAa,WAAW;IACtB,MAAM,CAAC,KAAK,CAAC,IAAwC;QACnD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAkB,EAAE,CAAC;QACnC,IAAI,SAAS,EAAE,CAAC;YACd,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAA,gBAAQ,EAAC;gBACb,OAAO,EAAE,oDAAoD,GAAG,EAAE;aACnE,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;CACF;AAjBD,kCAiBC"}

package/dist/cjs/modules/container/base.d.ts

@@ -10,10 +10,35 @@ export declare abstract class BaseContainer extends AbstractContainer {
     protected isCountingResolutions: boolean;
     /** Whether `startResolutionCounting` has ever run. A report read without it would name every binding, which is a wrong answer rather than an empty one. */
     protected hasStartedResolutionCounting: boolean;
+    /** The string each BOUND symbol is stored under: `Symbol('x')` twice is two keys, and both print as "Symbol(x)". */
+    protected symbolKeys: Map<symbol, string>;
+    /** How many symbols have been bound per description, so a new one gets its suffix in one step. */
+    protected symbolDescriptionCounts: Map<string, number>;
+    /**
+     * Nesting depth of the reads in progress. Past {@link CYCLE_CHECK_DEPTH} the keys are tracked, and
+     * a key met again is a cycle: a real graph is far shallower, so the common read pays one counter.
+     * Only the synchronous part is checked - a cycle through an `await` is not seen.
+     */
+    protected resolutionDepth: number;
+    protected resolvingKeys: Set<string>;
     constructor(opts?: {
         scope: string;
     });
     getMetadataRegistry(): import("../registry/registry").MetadataRegistry;
+    /**
+     * The string a key is stored under, or `undefined` for a symbol that was never bound - a lookup
+     * never records one, so reading with throwaway symbols leaves nothing behind.
+     */
+    protected toKeyString(opts: {
+        key: TBindingKey | {
+            namespace: string;
+            key: string;
+        };
+    }): string | undefined;
+    /** A bound symbol's own string: its description, suffixed (`Symbol(x)#2`) when another symbol holds it. */
+    protected bindSymbolKey(opts: {
+        key: symbol;
+    }): string;
     bind<T>(opts: {
         key: TBindingKey;
     }): Binding<T>;

package/dist/cjs/modules/container/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/modules/container/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAI7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,kKAAkK;AAClK,8BAAsB,aAAc,SAAQ,iBAAiB;IAC3D,SAAS,CAAC,QAAQ,4BAA8B;IAEhD,2EAA2E;IAC3E,SAAS,CAAC,gBAAgB,sBAA6B;IAEvD,mJAAmJ;IACnJ,SAAS,CAAC,qBAAqB,UAAS;IAExC,2JAA2J;IAC3J,SAAS,CAAC,4BAA4B,UAAS;gBAEnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAI3B,mBAAmB;IAInB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;QAAE,GAAG,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAQ/C,OAAO,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO;IAM5C,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE;QAC3B,GAAG,EAAE,WAAW,GAAG;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;KACvD,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IA2BhB,MAAM,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO;IAK3C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG,IAAI;IAK3C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE;QACpB,GAAG,EAAE,WAAW,GAAG;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QACtD,UAAU,CAAC,EAAE,KAAK,CAAC;KACpB,GAAG,CAAC;IACI,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE;QACpB,GAAG,EAAE,WAAW,GAAG;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QACtD,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,GAAG,CAAC,GAAG,SAAS;IA0BR,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,IAAI,EAAE;QACvC,QAAQ,EAAE;aACP,CAAC,IAAI,MAAM,CAAC,GAAG;gBACd,GAAG,EAAE,WAAW,GAAG;oBAAE,SAAS,EAAE,MAAM,CAAC;oBAAC,GAAG,EAAE,MAAM,CAAA;iBAAE,CAAC;gBACtD,UAAU,CAAC,EAAE,OAAO,CAAC;aACtB;SACF,CAAC;KACH,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;KAAE;IAMxC,gMAAgM;IACvL,uBAAuB,IAAI,IAAI;IAMxC,yFAAyF;IAChF,sBAAsB,IAAI,IAAI;IAIvC,4IAA4I;IACnI,mBAAmB,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC;IAIlD,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;IAI7B,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE;QAChC,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;KACvC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;IAyBP,KAAK,IAAI,IAAI;IAOb,KAAK,IAAI,IAAI;CAGvB"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/modules/container/base.ts"],"names":[],"mappings":"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"}