ditox 2.0.0 → 2.1.0

package/dist/esm/utils.d.ts

@@ -5,6 +5,10 @@ declare type ValuesProps = {
 declare type TokenProps<Props extends ValuesProps> = {
     [K in keyof Props]: Token<Props[K]>;
 };
+/**
+ * Checks if a value is the token
+ */
+export declare function isToken<T>(value: unknown): value is Token<T>;
 /**
  * Rebinds the array by the token with added new value.
  * @param container - Dependency container.
@@ -13,62 +17,120 @@ declare type TokenProps<Props extends ValuesProps> = {
  */
 export declare function bindMultiValue<T>(container: Container, token: Token<ReadonlyArray<T>>, value: T): void;
 /**
- * Returns an array of resolved values by the specified token.
+ * Tries to resolve a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const value = tryResolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = tryResolveValue(container, {a: tokenA, b: tokenB});
+ * console.log(props); // {a: 1, b: 2}
+ * ```
  */
-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;
+export declare function tryResolveValue<Tokens extends Token<unknown> | {
+    [key: string]: Token<unknown>;
+}, Values extends Tokens extends Token<infer V> ? V | undefined : Tokens extends TokenProps<infer Props> ? Partial<Props> : never>(container: Container, token: Tokens): Values;
 /**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `ResolverError` is thrown.
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const items1 = tryResolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = tryResolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
+ * ```
  */
-export declare function resolveValues<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
+export declare function tryResolveValues<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V | undefined : Tokens[K] extends TokenProps<infer Props> ? Partial<Props> : never;
 }>(container: Container, ...tokens: Tokens): Values;
 /**
- * Decorates a factory by passing resolved tokens as factory arguments.
- * @param factory - A factory.
- * @param tokens - Tokens which correspond to factory arguments.
- * @return Decorated factory which takes a dependency container as a single argument.
- */
-export declare function injectable<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
-}, Result>(this: unknown, factory: (...params: Values) => Result, ...tokens: Tokens): (container: Container) => Result;
-/**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
+ * Resolves a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a value is not found by the token, then `ResolverError` is thrown.
  *
  * @example
  * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
+ * const value = resolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = resolveValue(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>;
+export declare function resolveValue<Tokens extends Token<unknown> | {
+    [key: string]: Token<unknown>;
+}, Values extends Tokens extends Token<infer V> ? V : Tokens extends TokenProps<infer Props> ? Props : never>(container: Container, token: Tokens): Values;
 /**
- * Returns an object with resolved properties which are specified by token properties.
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `ResolverError` is thrown.
  *
  * @example
  * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
+ * const items1 = resolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = resolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
  * ```
  */
-export declare function resolveProps<Props extends ValuesProps>(container: Container, tokens: TokenProps<Props>): Props;
+export declare function resolveValues<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps<infer Props> ? Props : never;
+}>(container: Container, ...tokens: Tokens): Values;
 /**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
+ * Decorates a factory by passing resolved values as factory arguments.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
  * @param factory - A factory.
- * @param tokens - Object with tokens.
+ * @param tokens - Tokens which correspond to factory arguments.
+ *
  * @return Decorated factory which takes a dependency container as a single argument.
+ */
+export declare function injectable<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps<infer Props> ? Props : never;
+}, Result>(this: unknown, factory: (...params: Values) => Result, ...tokens: Tokens): (container: Container) => Result;
+/**
+ * Decorates a class by passing resolved values as arguments to its constructor.
  *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
+ * @param constructor - Constructor of a class
+ * @param tokens - Tokens which correspond to constructor arguments
+ *
+ * @return A factory function which takes a dependency container as a single argument
+ * and returns a new created class.
  */
-export declare function injectableProps<Props extends ValuesProps, Result>(factory: (props: Props) => Result, tokens: TokenProps<Props>): (container: Container) => Result;
+export declare function injectableClass<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps<infer Props> ? Props : never;
+}, Result>(this: unknown, constructor: new (...params: Values) => Result, ...tokens: Tokens): (container: Container) => Result;
 export {};

package/dist/esm/utils.js

@@ -1,3 +1,13 @@
+/**
+ * Checks if a value is the token
+ */
+export function isToken(value) {
+    return (value !== undefined &&
+        value !== null &&
+        typeof value === 'object' &&
+        'symbol' in value &&
+        typeof value.symbol === 'symbol');
+}
 /**
  * Rebinds the array by the token with added new value.
  * @param container - Dependency container.
@@ -11,78 +21,125 @@ export function bindMultiValue(container, token, value) {
     container.bindValue(token, nextValues);
 }
 /**
- * Returns an array of resolved values by the specified token.
+ * Tries to resolve a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const value = tryResolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = tryResolveValue(container, {a: tokenA, b: tokenB});
+ * console.log(props); // {a: 1, b: 2}
+ * ```
  */
-export function getValues(container, ...tokens) {
-    return tokens.map(container.get);
-}
-/**
- * Returns an array of resolved values by the specified token.
- * If a token is not found, then `ResolverError` is thrown.
- */
-export function resolveValues(container, ...tokens) {
-    return tokens.map(container.resolve);
+export function tryResolveValue(container, token) {
+    if (isToken(token)) {
+        return container.get(token);
+    }
+    const obj = {};
+    Object.keys(token).forEach((key) => (obj[key] = container.get(token[key])));
+    return obj;
 }
 /**
- * Decorates a factory by passing resolved tokens as factory arguments.
- * @param factory - A factory.
- * @param tokens - Tokens which correspond to factory arguments.
- * @return Decorated factory which takes a dependency container as a single argument.
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const items1 = tryResolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = tryResolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
+ * ```
  */
-export function injectable(factory, ...tokens) {
-    return (container) => {
-        const values = resolveValues(container, ...tokens);
-        return factory.apply(this, values);
-    };
+export function tryResolveValues(container, ...tokens) {
+    return tokens.map((item) => tryResolveValue(container, item));
 }
 /**
- * Returns an object with resolved properties which are specified by token properties.
- * If a token is not found, then `undefined` value is used.
+ * Resolves a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a value is not found by the token, then `ResolverError` is thrown.
  *
  * @example
  * ```ts
- * const props = getProps(container, {a: tokenA, b: tokenB});
+ * const value = resolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = resolveValue(container, {a: tokenA, b: tokenB});
  * console.log(props); // {a: 1, b: 2}
  * ```
  */
-export function getProps(container, tokens) {
-    const obj = { ...tokens };
-    Object.keys(obj).forEach((key) => (obj[key] = container.get(obj[key])));
+export function resolveValue(container, token) {
+    if (isToken(token)) {
+        return container.resolve(token);
+    }
+    const obj = {};
+    Object.keys(token).forEach((key) => (obj[key] = container.resolve(token[key])));
     return obj;
 }
 /**
- * Returns an object with resolved properties which are specified by token properties.
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `ResolverError` is thrown.
  *
  * @example
  * ```ts
- * const props = resolveProps(container, {a: tokenA, b: tokenB});
- * console.log(props); // {a: 1, b: 2}
+ * const items1 = resolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = resolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
  * ```
  */
-export function resolveProps(container, tokens) {
-    const obj = { ...tokens };
-    Object.keys(obj).forEach((key) => (obj[key] = container.resolve(obj[key])));
-    return obj;
+export function resolveValues(container, ...tokens) {
+    return tokens.map((item) => resolveValue(container, item));
 }
 /**
- * Decorates a factory by passing a resolved object with tokens as the first argument.
+ * Decorates a factory by passing resolved values as factory arguments.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
  * @param factory - A factory.
- * @param tokens - Object with tokens.
- * @return Decorated factory which takes a dependency container as a single argument.
+ * @param tokens - Tokens which correspond to factory arguments.
  *
- * @example
- * ```ts
- * const factory = ({a, b}: {a: number, b: number}) => a + b;
- * const decoratedFactory = injectableProps(factory, {a: tokenA, b: tokenB});
- * const result = decoratedFactory(container);
- * ```
+ * @return Decorated factory which takes a dependency container as a single argument.
  */
-export function injectableProps(factory, tokens) {
+export function injectable(factory, ...tokens) {
     return (container) => {
-        const values = resolveProps(container, tokens);
-        return factory(values);
+        const values = resolveValues(container, ...tokens);
+        return factory.apply(this, values);
     };
 }
+/**
+ * Decorates a class by passing resolved values as arguments to its constructor.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
+ * @param constructor - Constructor of a class
+ * @param tokens - Tokens which correspond to constructor arguments
+ *
+ * @return A factory function which takes a dependency container as a single argument
+ * and returns a new created class.
+ */
+export function injectableClass(constructor, ...tokens) {
+    return injectable((...values) => new constructor(...values), ...tokens);
+}
 //# sourceMappingURL=utils.js.map

package/dist/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,SAAoB,EACpB,KAA8B,EAC9B,KAAQ;;IAER,MAAM,UAAU,GAAG,MAAA,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1C,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,SAAS,CAKvB,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAW,CAAC;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAK3B,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAW,CAAC;AACjD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAQxB,OAAsC,EACtC,GAAG,MAAc;IAEjB,OAAO,CAAC,SAAS,EAAE,EAAE;QACnB,MAAM,MAAM,GAAW,aAAa,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CACtB,SAAoB,EACpB,MAAyB;IAEzB,MAAM,GAAG,GAAQ,EAAC,GAAG,MAAM,EAAC,CAAC;IAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAC1B,SAAoB,EACpB,MAAyB;IAEzB,MAAM,GAAG,GAAQ,EAAC,GAAG,MAAM,EAAC,CAAC;IAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAC7B,OAAiC,EACjC,MAAyB;IAEzB,OAAO,CAAC,SAAS,EAAE,EAAE;QACnB,MAAM,MAAM,GAAU,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACtD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,UAAU,OAAO,CAAI,KAAc;IACvC,OAAO,CACL,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,QAAQ,IAAI,KAAK;QACjB,OAAQ,KAAa,CAAC,MAAM,KAAK,QAAQ,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,SAAoB,EACpB,KAA8B,EAC9B,KAAQ;;IAER,MAAM,UAAU,GAAG,MAAA,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1C,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,eAAe,CAO7B,SAAoB,EAAE,KAAa;IACnC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,CAAW,CAAC;KACvC;IAED,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,gBAAgB,CAS9B,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAW,CAAC;AAC1E,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,YAAY,CAO1B,SAAoB,EAAE,KAAa;IACnC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,OAAO,CAAC,KAAK,CAAW,CAAC;KAC3C;IAED,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CACxB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CACpD,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,aAAa,CAS3B,SAAoB,EAAE,GAAG,MAAc;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAW,CAAC;AACvE,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,UAAU,CAYxB,OAAsC,EACtC,GAAG,MAAc;IAEjB,OAAO,CAAC,SAAS,EAAE,EAAE;QACnB,MAAM,MAAM,GAAW,aAAa,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAY7B,WAA8C,EAC9C,GAAG,MAAc;IAEjB,OAAO,UAAU,CACf,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,GAAG,MAAM,CAAC,EACzC,GAAG,MAAM,CACV,CAAC;AACJ,CAAC"}

package/dist/umd/index.d.ts

@@ -102,12 +102,16 @@ declare type Container = {
  */
 declare function createContainer(parentContainer?: Container): Container;
 
-declare type ValuesProps = {
+declare type ValuesProps$1 = {
     [key: string]: unknown;
 };
-declare type TokenProps<Props extends ValuesProps> = {
+declare type TokenProps$1<Props extends ValuesProps$1> = {
     [K in keyof Props]: Token<Props[K]>;
 };
+/**
+ * Checks if a value is the token
+ */
+declare function isToken<T>(value: unknown): value is Token<T>;
 /**
  * Rebinds the array by the token with added new value.
  * @param container - Dependency container.
@@ -116,32 +120,144 @@ declare type TokenProps<Props extends ValuesProps> = {
  */
 declare function bindMultiValue<T>(container: Container, token: Token<ReadonlyArray<T>>, value: T): void;
 /**
- * Returns an array of resolved values by the specified token.
+ * Tries to resolve a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const value = tryResolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = tryResolveValue(container, {a: tokenA, b: tokenB});
+ * console.log(props); // {a: 1, b: 2}
+ * ```
  */
-declare function getValues<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
+declare function tryResolveValue<Tokens extends Token<unknown> | {
+    [key: string]: Token<unknown>;
+}, Values extends Tokens extends Token<infer V> ? V | undefined : Tokens extends TokenProps$1<infer Props> ? Partial<Props> : never>(container: Container, token: Tokens): Values;
+/**
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a token is not found, then `undefined` value is used.
+ *
+ * @example
+ * ```ts
+ * const items1 = tryResolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = tryResolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
+ * ```
+ */
+declare function tryResolveValues<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V | undefined : Tokens[K] extends TokenProps$1<infer Props> ? Partial<Props> : never;
 }>(container: Container, ...tokens: Tokens): Values;
 /**
- * Returns an array of resolved values by the specified token.
+ * Resolves a value by the provided token.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
+ * If a value is not found by the token, then `ResolverError` is thrown.
+ *
+ * @example
+ * ```ts
+ * const value = resolveValue(container, tokenA);
+ * console.log(value); // 1
+ *
+ * const props = resolveValue(container, {a: tokenA, b: tokenB});
+ * console.log(props); // {a: 1, b: 2}
+ * ```
+ */
+declare function resolveValue<Tokens extends Token<unknown> | {
+    [key: string]: Token<unknown>;
+}, Values extends Tokens extends Token<infer V> ? V : Tokens extends TokenProps$1<infer Props> ? Props : never>(container: Container, token: Tokens): Values;
+/**
+ * Returns an array of resolved values or objects with resolved values.
+ *
+ * If an item of the array is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+
  * If a token is not found, then `ResolverError` is thrown.
+ *
+ * @example
+ * ```ts
+ * const items1 = resolveValues(container, tokenA);
+ * console.log(items1); // [1]
+ *
+ * const items2 = resolveValues(container, tokenA, {a: tokenA, b: tokenB});
+ * console.log(items2); // [1, {a: 1, b: 2}]
+ * ```
  */
-declare function resolveValues<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
+declare function resolveValues<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps$1<infer Props> ? Props : never;
 }>(container: Container, ...tokens: Tokens): Values;
 /**
- * Decorates a factory by passing resolved tokens as factory arguments.
+ * Decorates a factory by passing resolved values as factory arguments.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
  * @param factory - A factory.
  * @param tokens - Tokens which correspond to factory arguments.
+ *
  * @return Decorated factory which takes a dependency container as a single argument.
  */
-declare function injectable<Tokens extends Token<unknown>[], Values extends {
-    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : never;
+declare function injectable<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps$1<infer Props> ? Props : never;
 }, Result>(this: unknown, factory: (...params: Values) => Result, ...tokens: Tokens): (container: Container) => Result;
+/**
+ * Decorates a class by passing resolved values as arguments to its constructor.
+ *
+ * If an argument is an object which has tokens as its properties,
+ * then returns an object containing resolved values as properties.
+ *
+ * @param constructor - Constructor of a class
+ * @param tokens - Tokens which correspond to constructor arguments
+ *
+ * @return A factory function which takes a dependency container as a single argument
+ * and returns a new created class.
+ */
+declare function injectableClass<Tokens extends (Token<unknown> | {
+    [key: string]: Token<unknown>;
+})[], Values extends {
+    [K in keyof Tokens]: Tokens[K] extends Token<infer V> ? V : Tokens[K] extends TokenProps$1<infer Props> ? Props : never;
+}, Result>(this: unknown, constructor: new (...params: Values) => Result, ...tokens: Tokens): (container: Container) => Result;
+
+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.
+ */
+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});
@@ -153,6 +269,8 @@ declare function getProps<Props extends ValuesProps>(container: Container, token
  * 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});
@@ -166,6 +284,8 @@ declare function resolveProps<Props extends ValuesProps>(container: Container, t
  * @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;
@@ -298,4 +418,4 @@ declare function declareModule<T>(declaration: Omit<ModuleDeclaration<T>, 'token
  */
 declare function declareModuleBindings(modules: ReadonlyArray<ModuleBindingEntry>): ModuleDeclaration<Module>;
 
-export { BindModuleOptions, Container, FactoryOptions, FactoryScope, Module, ModuleBindingEntry, ModuleDeclaration, OptionalToken, RequiredToken, ResolverError, Token, bindModule, bindModules, bindMultiValue, createContainer, declareModule, declareModuleBindings, getProps, getValues, injectable, injectableProps, optional, resolveProps, resolveValues, token };
+export { BindModuleOptions, Container, FactoryOptions, FactoryScope, Module, ModuleBindingEntry, ModuleDeclaration, OptionalToken, RequiredToken, ResolverError, Token, bindModule, bindModules, bindMultiValue, createContainer, declareModule, declareModuleBindings, getProps, getValues, injectable, injectableClass, injectableProps, isToken, optional, resolveProps, resolveValue, resolveValues, token, tryResolveValue, tryResolveValues };

package/dist/umd/index.js

@@ -1,2 +1,2 @@
-!function(o,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((o="undefined"!=typeof globalThis?globalThis:o||self).Ditox={})}(this,(function(o){"use strict";var n=function(o,t){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(o,n){o.__proto__=n}||function(o,n){for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(o[t]=n[t])},n(o,t)};var t=function(){return t=Object.assign||function(o){for(var n,t=1,e=arguments.length;t<e;t++)for(var r in n=arguments[t])Object.prototype.hasOwnProperty.call(n,r)&&(o[r]=n[r]);return o},t.apply(this,arguments)};function e(o,n,t){if(t||2===arguments.length)for(var e,r=0,i=n.length;r<i;r++)!e&&r in n||(e||(e=Array.prototype.slice.call(n,0,r)),e[r]=n[r]);return o.concat(e||Array.prototype.slice.call(n))}function r(o){return{symbol:Symbol(o)}}var i=function(o){function t(n){var t=this.constructor,e=o.call(this,n)||this;return Object.setPrototypeOf(e,t.prototype),e.name="ResolverError",e}return function(o,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function e(){this.constructor=o}n(o,t),o.prototype=null===t?Object.create(t):(e.prototype=t.prototype,new e)}(t,o),t}(Error),l=r("ditox.Container"),u=r("ditox.ParentContainer"),a=r("ditox.Resolver"),s=Symbol(),c=function(){throw new Error("FAKE_FACTORY")},f=r("ditox.FactoriesMap");function p(o){return o.symbol===l.symbol||o.symbol===u.symbol||o.symbol===a.symbol}function d(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return n.map(o.resolve)}function v(o){for(var n=this,t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];return function(r){var i=d.apply(void 0,e([r],t,!1));return o.apply(n,i)}}function y(o,n){var e=t({},n);return Object.keys(e).forEach((function(n){return e[n]=o.resolve(e[n])})),e}function b(o,n,t){var e,r=n.token,i=n.imports,l=n.factory,u=n.beforeBinding,a=n.afterBinding,s=null!==(e=n.exports)&&void 0!==e?e:n.exportedProps,c=null==t?void 0:t.scope;u&&u(o),i&&m(o,i);var f=new Set;s&&Object.keys(s).forEach((function(n){var t=s[n];t&&(f.add(t),o.bindFactory(t,v((function(o){return o[n]}),r),{scope:c}))}));o.bindFactory(r,l,{scope:c,onRemoved:function(n){n.destroy&&n.destroy(),f.forEach((function(n){return o.remove(n)})),f.clear()}}),a&&a(o)}function m(o,n){n.forEach((function(n){"module"in n?b(o,n.module,n.options):b(o,n)}))}function h(o){var n;return t(t({},o),{token:null!==(n=o.token)&&void 0!==n?n:r()})}o.ResolverError=i,o.bindModule=b,o.bindModules=m,o.bindMultiValue=function(o,n,t){var r,i=e(e([],null!==(r=o.get(n))&&void 0!==r?r:[],!0),[t],!1);o.bindValue(n,i)},o.createContainer=function(o){var n=new Map,t=new Map,e={bindValue:function(o,t){p(o)||n.set(o.symbol,t)},bindFactory:function(o,n,e){p(o)||t.set(o.symbol,{factory:n,options:e})},remove:function(o){var e;if(!p(o)){var r=null===(e=t.get(o.symbol))||void 0===e?void 0:e.options;r&&d(o.symbol,r),n.delete(o.symbol),t.delete(o.symbol)}},removeAll:function(){t.forEach((function(o,n){o.options&&d(n,o.options)})),n.clear(),t.clear(),v()},hasToken:function(e){var r;return n.has(e.symbol)||t.has(e.symbol)||null!==(r=null==o?void 0:o.hasToken(e))&&void 0!==r&&r},get:function(o){var n=r(o,e);return n!==s?n:o.isOptional?o.optionalValue:void 0},resolve:function(o){var n,t=r(o,e);if(t!==s)return t;if(o.isOptional)return o.optionalValue;throw new i('Token "'.concat(null!==(n=o.symbol.description)&&void 0!==n?n:"",'" is not provided'))}};function r(r,i){var l=n.get(r.symbol),u=void 0!==l||n.has(r.symbol);if(u&&i===e)return l;var f,p,d=t.get(r.symbol);if(d&&d.factory!==c)switch(f=d.options,null!==(p=null==f?void 0:f.scope)&&void 0!==p?p:"singleton"){case"singleton":if(u)return l;if(null==o?void 0:o.hasToken(r))break;var v=d.factory(e);return e.bindValue(r,v),v;case"scoped":var y=d.factory(i);return i.bindValue(r,y),i!==e&&i.bindFactory(r,c,d.options),y;case"transient":return d.factory(i)}if(u)return l;var b=null==o?void 0:o.get(a);return b?b(r,i):s}function d(o,t){var e=function(o){return void 0===o.scope||"scoped"===o.scope||"singleton"===o.scope?o.onRemoved:void 0}(t);if(e){var r=n.get(o);(void 0!==r||n.has(o))&&e(r)}}function v(){n.set(l.symbol,e),n.set(a.symbol,r),n.set(f.symbol,t),o&&n.set(u.symbol,o)}return v(),e},o.declareModule=h,o.declareModuleBindings=function(o){return h({factory:function(){return{}},imports:o})},o.getProps=function(o,n){var e=t({},n);return Object.keys(e).forEach((function(n){return e[n]=o.get(e[n])})),e},o.getValues=function(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return n.map(o.get)},o.injectable=v,o.injectableProps=function(o,n){return function(t){var e=y(t,n);return o(e)}},o.optional=function(o,n){return{symbol:o.symbol,isOptional:!0,optionalValue:n}},o.resolveProps=y,o.resolveValues=d,o.token=r,Object.defineProperty(o,"__esModule",{value:!0})}));
+!function(o,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((o="undefined"!=typeof globalThis?globalThis:o||self).Ditox={})}(this,(function(o){"use strict";var n=function(o,t){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(o,n){o.__proto__=n}||function(o,n){for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(o[t]=n[t])},n(o,t)};var t=function(){return t=Object.assign||function(o){for(var n,t=1,e=arguments.length;t<e;t++)for(var r in n=arguments[t])Object.prototype.hasOwnProperty.call(n,r)&&(o[r]=n[r]);return o},t.apply(this,arguments)};function e(o,n,t){if(t||2===arguments.length)for(var e,r=0,i=n.length;r<i;r++)!e&&r in n||(e||(e=Array.prototype.slice.call(n,0,r)),e[r]=n[r]);return o.concat(e||Array.prototype.slice.call(n))}function r(o){return{symbol:Symbol(o)}}var i=function(o){function t(n){var t=this.constructor,e=o.call(this,n)||this;return Object.setPrototypeOf(e,t.prototype),e.name="ResolverError",e}return function(o,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function e(){this.constructor=o}n(o,t),o.prototype=null===t?Object.create(t):(e.prototype=t.prototype,new e)}(t,o),t}(Error),l=r("ditox.Container"),u=r("ditox.ParentContainer"),a=r("ditox.Resolver"),s=Symbol(),c=function(){throw new Error("FAKE_FACTORY")},f=r("ditox.FactoriesMap");function p(o){return o.symbol===l.symbol||o.symbol===u.symbol||o.symbol===a.symbol}function y(o){return null!=o&&"object"==typeof o&&"symbol"in o&&"symbol"==typeof o.symbol}function v(o,n){if(y(n))return o.get(n);var t={};return Object.keys(n).forEach((function(e){return t[e]=o.get(n[e])})),t}function d(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return n.map((function(n){return v(o,n)}))}function b(o,n){if(y(n))return o.resolve(n);var t={};return Object.keys(n).forEach((function(e){return t[e]=o.resolve(n[e])})),t}function m(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return n.map((function(n){return b(o,n)}))}function h(o){for(var n=this,t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];return function(r){var i=m.apply(void 0,e([r],t,!1));return o.apply(n,i)}}function g(o,n,t){var e,r=n.token,i=n.imports,l=n.factory,u=n.beforeBinding,a=n.afterBinding,s=null!==(e=n.exports)&&void 0!==e?e:n.exportedProps,c=null==t?void 0:t.scope;u&&u(o),i&&O(o,i);var f=new Set;s&&Object.keys(s).forEach((function(n){var t=s[n];t&&(f.add(t),o.bindFactory(t,h((function(o){return o[n]}),r),{scope:c}))}));o.bindFactory(r,l,{scope:c,onRemoved:function(n){n.destroy&&n.destroy(),f.forEach((function(n){return o.remove(n)})),f.clear()}}),a&&a(o)}function O(o,n){n.forEach((function(n){"module"in n?g(o,n.module,n.options):g(o,n)}))}function j(o){var n;return t(t({},o),{token:null!==(n=o.token)&&void 0!==n?n:r()})}o.ResolverError=i,o.bindModule=g,o.bindModules=O,o.bindMultiValue=function(o,n,t){var r,i=e(e([],null!==(r=o.get(n))&&void 0!==r?r:[],!0),[t],!1);o.bindValue(n,i)},o.createContainer=function(o){var n=new Map,t=new Map,e={bindValue:function(o,t){p(o)||n.set(o.symbol,t)},bindFactory:function(o,n,e){p(o)||t.set(o.symbol,{factory:n,options:e})},remove:function(o){var e;if(!p(o)){var r=null===(e=t.get(o.symbol))||void 0===e?void 0:e.options;r&&y(o.symbol,r),n.delete(o.symbol),t.delete(o.symbol)}},removeAll:function(){t.forEach((function(o,n){o.options&&y(n,o.options)})),n.clear(),t.clear(),v()},hasToken:function(e){var r;return n.has(e.symbol)||t.has(e.symbol)||null!==(r=null==o?void 0:o.hasToken(e))&&void 0!==r&&r},get:function(o){var n=r(o,e);return n!==s?n:o.isOptional?o.optionalValue:void 0},resolve:function(o){var n,t=r(o,e);if(t!==s)return t;if(o.isOptional)return o.optionalValue;throw new i('Token "'.concat(null!==(n=o.symbol.description)&&void 0!==n?n:"",'" is not provided'))}};function r(r,i){var l=n.get(r.symbol),u=void 0!==l||n.has(r.symbol);if(u&&i===e)return l;var f,p,y=t.get(r.symbol);if(y&&y.factory!==c)switch(f=y.options,null!==(p=null==f?void 0:f.scope)&&void 0!==p?p:"singleton"){case"singleton":if(u)return l;if(null==o?void 0:o.hasToken(r))break;var v=y.factory(e);return e.bindValue(r,v),v;case"scoped":var d=y.factory(i);return i.bindValue(r,d),i!==e&&i.bindFactory(r,c,y.options),d;case"transient":return y.factory(i)}if(u)return l;var b=null==o?void 0:o.get(a);return b?b(r,i):s}function y(o,t){var e=function(o){return void 0===o.scope||"scoped"===o.scope||"singleton"===o.scope?o.onRemoved:void 0}(t);if(e){var r=n.get(o);(void 0!==r||n.has(o))&&e(r)}}function v(){n.set(l.symbol,e),n.set(a.symbol,r),n.set(f.symbol,t),o&&n.set(u.symbol,o)}return v(),e},o.declareModule=j,o.declareModuleBindings=function(o){return j({factory:function(){return{}},imports:o})},o.getProps=function(o,n){return v(o,n)},o.getValues=function(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return d.apply(void 0,e([o],n,!1))},o.injectable=h,o.injectableClass=function(o){for(var n=[],t=1;t<arguments.length;t++)n[t-1]=arguments[t];return h.apply(void 0,e([function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];return new(o.bind.apply(o,e([void 0],n,!1)))}],n,!1))},o.injectableProps=function(o,n){return h(o,n)},o.isToken=y,o.optional=function(o,n){return{symbol:o.symbol,isOptional:!0,optionalValue:n}},o.resolveProps=function(o,n){return b(o,n)},o.resolveValue=b,o.resolveValues=m,o.token=r,o.tryResolveValue=v,o.tryResolveValues=d,Object.defineProperty(o,"__esModule",{value:!0})}));
 //# sourceMappingURL=index.js.map