ditox 2.1.0 → 2.3.0

package/docs/classes/ResolverError.md

@@ -36,8 +36,8 @@ ResolverError is thrown by the resolver when a token is not found in a container
 
 #### Parameters
 
-| Name | Type |
-| :------ | :------ |
+| Name      | Type     |
+| :-------- | :------- |
 | `message` | `string` |
 
 #### Overrides
@@ -46,7 +46,7 @@ Error.constructor
 
 #### Defined in
 
-[packages/ditox/src/ditox.ts:61](https://github.com/mnasyrov/ditox/blob/aea7a8f/packages/ditox/src/ditox.ts#L61)
+[packages/ditox/src/ditox.ts:61](https://github.com/mnasyrov/ditox/blob/37f658c/packages/ditox/src/ditox.ts#L61)
 
 ## Properties
 
@@ -60,9 +60,9 @@ Error.message
 
 #### Defined in
 
-node_modules/typescript/lib/lib.es5.d.ts:1023
+node_modules/typescript/lib/lib.es5.d.ts:1054
 
-___
+---
 
 ### name
 
@@ -74,9 +74,9 @@ Error.name
 
 #### Defined in
 
-node_modules/typescript/lib/lib.es5.d.ts:1022
+node_modules/typescript/lib/lib.es5.d.ts:1053
 
-___
+---
 
 ### stack
 
@@ -88,9 +88,9 @@ Error.stack
 
 #### Defined in
 
-node_modules/typescript/lib/lib.es5.d.ts:1024
+node_modules/typescript/lib/lib.es5.d.ts:1055
 
-___
+---
 
 ### prepareStackTrace
 
@@ -102,13 +102,15 @@ ___
 
 Optional override for formatting stack traces
 
-**`see`** https://v8.dev/docs/stack-trace-api#customizing-stack-traces
+**`See`**
+
+https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 ##### Parameters
 
-| Name | Type |
-| :------ | :------ |
-| `err` | `Error` |
+| Name          | Type         |
+| :------------ | :----------- |
+| `err`         | `Error`      |
 | `stackTraces` | `CallSite`[] |
 
 ##### Returns
@@ -123,7 +125,7 @@ Error.prepareStackTrace
 
 node_modules/@types/node/globals.d.ts:11
 
-___
+---
 
 ### stackTraceLimit
 
@@ -147,9 +149,9 @@ Create .stack property on a target object
 
 #### Parameters
 
-| Name | Type |
-| :------ | :------ |
-| `targetObject` | `object` |
+| Name              | Type       |
+| :---------------- | :--------- |
+| `targetObject`    | `object`   |
 | `constructorOpt?` | `Function` |
 
 #### Returns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ditox",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Powerful dependency injection container for building modular apps.",
   "license": "MIT",
   "author": "Mikhail Nasyrov <mikhail@mnasyrov.com> (https://github.com/mnasyrov)",
@@ -47,5 +47,5 @@
     "build:esm": "tsc -p tsconfig.build.json --outDir dist/esm --module es2015",
     "build:rollup": "rollup -c"
   },
-  "gitHead": "8e8e4d79b6aaf3fa8662e51ecce0511f53e10ea8"
+  "gitHead": "3d34ea7a89e0bb599fa2d9dbfa67e75ec68bfba2"
 }

package/src/index.ts

@@ -19,13 +19,6 @@ export {
   injectableClass,
 } from './utils';
 
-export {
-  getValues,
-  getProps,
-  resolveProps,
-  injectableProps,
-} from './utils-deprecated';
-
 export {
   bindModule,
   bindModules,

package/src/modules.ts

@@ -59,13 +59,6 @@ export type ModuleDeclaration<T extends Module<AnyObject>> = {
     [K in keyof GetModuleProps<T>]?: Token<GetModuleProps<T>[K]>;
   };
 
-  /**
-   * Dictionary of module properties which are bound to tokens.
-   *
-   * @deprecated Use `exports` property.
-   */
-  exportedProps?: ModuleDeclaration<T>['exports'];
-
   /** Callback could be used to prepare an environment. It is called before binding the module. */
   beforeBinding?: (container: Container) => void;
 
@@ -73,6 +66,8 @@ export type ModuleDeclaration<T extends Module<AnyObject>> = {
   afterBinding?: (container: Container) => void;
 };
 
+export type AnyModuleDeclaration = ModuleDeclaration<Module<AnyObject>>;
+
 /**
  * Options for module binding.
  *
@@ -109,7 +104,7 @@ export function bindModule<T extends Module<AnyObject>>(
 ): void {
   const {token, imports, factory, beforeBinding, afterBinding} =
     moduleDeclaration;
-  const exports = moduleDeclaration.exports ?? moduleDeclaration.exportedProps;
+  const exports = moduleDeclaration.exports;
 
   const scope = options?.scope;
 
@@ -198,7 +193,7 @@ export function bindModules(
  * });
  * ```
  */
-export function declareModule<T>(
+export function declareModule<T extends Module<AnyObject>>(
   declaration: Omit<ModuleDeclaration<T>, 'token'> &
     Partial<Pick<ModuleDeclaration<T>, 'token'>>,
 ): ModuleDeclaration<T> {

package/dist/cjs/utils-deprecated.d.ts

@@ -1,59 +0,0 @@
-import type { Container, Token } from './ditox';
-declare type ValuesProps = {
-    [key: string]: unknown;
-};
-declare type TokenProps<Props extends ValuesProps> = {
-    [K in keyof Props]: Token<Props[K]>;
-};
-/**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValues()` function.
- */
-export declare function getValues<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
-}>(container: Container, ...tokens: Tokens): Values;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValue()` function.
- *
- * @example
- * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export declare function getProps<Props extends ValuesProps>(container: Container, tokens: TokenProps<Props>): Partial<Props>;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `ResolverError` is thrown.
- *
- * @deprecated Use `resolveValue()` function.
- *
- * @example
- * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export declare function resolveProps<Props extends ValuesProps>(container: Container, tokens: TokenProps<Props>): Props;
-/**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
- * @param factory - A factory.
- * @param tokens - Object with tokens.
- * @return Decorated factory which takes a dependency container as a single argument.
- *
- * @deprecated Use `injectable()` function.
- *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
- */
-export declare function injectableProps<Props extends ValuesProps, Result>(factory: (props: Props) => Result, tokens: TokenProps<Props>): (container: Container) => Result;
-export {};

package/dist/cjs/utils-deprecated.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectableProps = exports.resolveProps = exports.getProps = exports.getValues = void 0;
-const utils_1 = require("./utils");
-/**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValues()` function.
- */
-function getValues(container, ...tokens) {
-    return (0, utils_1.tryResolveValues)(container, ...tokens);
-}
-exports.getValues = getValues;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValue()` function.
- *
- * @example
- * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-function getProps(container, tokens) {
-    return (0, utils_1.tryResolveValue)(container, tokens);
-}
-exports.getProps = getProps;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `ResolverError` is thrown.
- *
- * @deprecated Use `resolveValue()` function.
- *
- * @example
- * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-function resolveProps(container, tokens) {
-    return (0, utils_1.resolveValue)(container, tokens);
-}
-exports.resolveProps = resolveProps;
-/**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
- * @param factory - A factory.
- * @param tokens - Object with tokens.
- * @return Decorated factory which takes a dependency container as a single argument.
- *
- * @deprecated Use `injectable()` function.
- *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
- */
-function injectableProps(factory, tokens) {
-    return (0, utils_1.injectable)(factory, tokens);
-}
-exports.injectableProps = injectableProps;
-//# sourceMappingURL=utils-deprecated.js.map

package/dist/cjs/utils-deprecated.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils-deprecated.js","sourceRoot":"","sources":["../../src/utils-deprecated.ts"],"names":[],"mappings":";;;AACA,mCAKiB;AAOjB;;;;;GAKG;AACH,SAAgB,SAAS,CAKvB,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,IAAA,wBAAgB,EAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;AAChD,CAAC;AAPD,8BAOC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,QAAQ,CACtB,SAAoB,EACpB,MAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,SAAS,EAAE,MAAM,CAAmB,CAAC;AAC9D,CAAC;AALD,4BAKC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,YAAY,CAC1B,SAAoB,EACpB,MAAyB;IAEzB,OAAO,IAAA,oBAAY,EAAC,SAAS,EAAE,MAAM,CAAU,CAAC;AAClD,CAAC;AALD,oCAKC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,eAAe,CAC7B,OAAiC,EACjC,MAAyB;IAEzB,OAAO,IAAA,kBAAU,EAAC,OAAc,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AALD,0CAKC"}

package/dist/esm/utils-deprecated.d.ts

@@ -1,59 +0,0 @@
-import type { Container, Token } from './ditox';
-declare type ValuesProps = {
-    [key: string]: unknown;
-};
-declare type TokenProps<Props extends ValuesProps> = {
-    [K in keyof Props]: Token<Props[K]>;
-};
-/**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValues()` function.
- */
-export declare function getValues<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
-}>(container: Container, ...tokens: Tokens): Values;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValue()` function.
- *
- * @example
- * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export declare function getProps<Props extends ValuesProps>(container: Container, tokens: TokenProps<Props>): Partial<Props>;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `ResolverError` is thrown.
- *
- * @deprecated Use `resolveValue()` function.
- *
- * @example
- * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export declare function resolveProps<Props extends ValuesProps>(container: Container, tokens: TokenProps<Props>): Props;
-/**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
- * @param factory - A factory.
- * @param tokens - Object with tokens.
- * @return Decorated factory which takes a dependency container as a single argument.
- *
- * @deprecated Use `injectable()` function.
- *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
- */
-export declare function injectableProps<Props extends ValuesProps, Result>(factory: (props: Props) => Result, tokens: TokenProps<Props>): (container: Container) => Result;
-export {};

package/dist/esm/utils-deprecated.js

@@ -1,59 +0,0 @@
-import { injectable, resolveValue, tryResolveValue, tryResolveValues, } from './utils';
-/**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValues()` function.
- */
-export function getValues(container, ...tokens) {
-    return tryResolveValues(container, ...tokens);
-}
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
- *
- * @deprecated Use `tryResolveValue()` function.
- *
- * @example
- * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export function getProps(container, tokens) {
-    return tryResolveValue(container, tokens);
-}
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `ResolverError` is thrown.
- *
- * @deprecated Use `resolveValue()` function.
- *
- * @example
- * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
- * ```
- */
-export function resolveProps(container, tokens) {
-    return resolveValue(container, tokens);
-}
-/**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
- * @param factory - A factory.
- * @param tokens - Object with tokens.
- * @return Decorated factory which takes a dependency container as a single argument.
- *
- * @deprecated Use `injectable()` function.
- *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
- */
-export function injectableProps(factory, tokens) {
-    return injectable(factory, tokens);
-}
-//# sourceMappingURL=utils-deprecated.js.map

package/dist/esm/utils-deprecated.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils-deprecated.js","sourceRoot":"","sources":["../../src/utils-deprecated.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,eAAe,EACf,gBAAgB,GACjB,MAAM,SAAS,CAAC;AAOjB;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAKvB,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,gBAAgB,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;AAChD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,QAAQ,CACtB,SAAoB,EACpB,MAAyB;IAEzB,OAAO,eAAe,CAAC,SAAS,EAAE,MAAM,CAAmB,CAAC;AAC9D,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAC1B,SAAoB,EACpB,MAAyB;IAEzB,OAAO,YAAY,CAAC,SAAS,EAAE,MAAM,CAAU,CAAC;AAClD,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,eAAe,CAC7B,OAAiC,EACjC,MAAyB;IAEzB,OAAO,UAAU,CAAC,OAAc,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC"}