dependency-injection-cat - npm Package Compare versions

Comparing version 0.0.17-beta to 0.0.18-beta

core/bean/registerArrowFunctionBean.js

@@ -44,2 +44,3 @@ "use strict";
         classMemberName: classElement.name.getText(),
+        nestedProperty: null,
         contextDescriptor: contextDescriptor,
@@ -46,0 +47,0 @@ scope: beanInfo.scope,

core/bean/registerBeans.js

@@ -13,2 +13,4 @@ "use strict";
 var registerExpressionBean_1 = require("./registerExpressionBean");
+var isEmbeddedBean_1 = require("../ts-helpers/predicates/isEmbeddedBean");
+var registerEmbeddedBeans_1 = require("./registerEmbeddedBeans");
 function registerBeans(contextDescriptor) {
@@ -29,4 +31,7 @@ BeanRepository_1.BeanRepository.clearBeanInfoByContextDescriptor(contextDescriptor);
         }
+        if ((0, isEmbeddedBean_1.isEmbeddedBean)(classElement)) {
+            (0, registerEmbeddedBeans_1.registerEmbeddedBean)(contextDescriptor, classElement);
+        }
     });
 }
 exports.registerBeans = registerBeans;

core/bean/registerExpressionBean.js

@@ -44,2 +44,3 @@ "use strict";
         classMemberName: classElement.name.getText(),
+        nestedProperty: null,
         contextDescriptor: contextDescriptor,
@@ -46,0 +47,0 @@ qualifiedType: qualifiedType,

core/bean/registerMethodBean.js

@@ -53,2 +53,3 @@ "use strict";
         classMemberName: classElement.name.getText(),
+        nestedProperty: null,
         contextDescriptor: contextDescriptor,
@@ -55,0 +56,0 @@ qualifiedType: qualifiedType,

core/bean/registerPropertyBean.js

@@ -52,2 +52,3 @@ "use strict";
         classMemberName: classElement.name.getText(),
+        nestedProperty: null,
         contextDescriptor: contextDescriptor,
@@ -54,0 +55,0 @@ scope: beanInfo.scope,

core/build-context/registerAndTransformContext.js

@@ -24,3 +24,3 @@ "use strict";
 var transformArrowFunctionBeans_1 = require("./transformers/transformArrowFunctionBeans");
-var transformExpressionBeans_1 = require("./transformers/transformExpressionBeans");
+var transformExpressionAndEmbeddedBeans_1 = require("./transformers/transformExpressionAndEmbeddedBeans");
 var registerContextLifecycleMethods_1 = require("../context-lifecycle/registerContextLifecycleMethods");
@@ -53,3 +53,3 @@ var transformLifecycleMethods_1 = require("./transformers/transformLifecycleMethods");
             (0, transformArrowFunctionBeans_1.transformArrowFunctionBeans)(contextDescriptorToIdentifierList_1),
-            (0, transformExpressionBeans_1.transformExpressionBeans)(),
+            (0, transformExpressionAndEmbeddedBeans_1.transformExpressionAndEmbeddedBeans)(),
             (0, addNecessaryImports_1.addNecessaryImports)(contextDescriptorToIdentifierList_1),
@@ -83,3 +83,3 @@ ];
         (0, transformArrowFunctionBeans_1.transformArrowFunctionBeans)(contextDescriptorToIdentifierList),
-        (0, transformExpressionBeans_1.transformExpressionBeans)(),
+        (0, transformExpressionAndEmbeddedBeans_1.transformExpressionAndEmbeddedBeans)(),
         (0, transformLifecycleMethods_1.transformLifecycleMethods)(contextDescriptorToIdentifierList),
@@ -86,0 +86,0 @@ (0, transformLifecycleArrowFunctions_1.transformLifecycleArrowFunctions)(contextDescriptorToIdentifierList),

core/build-context/transformers/buildBeanCallExpressionForSingleBeanForLifecycle.js

@@ -46,6 +46,14 @@ "use strict";
     if (isBeanFromCurrentContext(beanDescriptor.contextDescriptor, contextLifecycleDescriptor.contextDescriptor)) {
-        return typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createThis(), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(beanDescriptor.classMemberName)]);
+        var beanAccessExpression_1 = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createThis(), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(beanDescriptor.classMemberName)]);
+        if (beanDescriptor.nestedProperty !== null) {
+            beanAccessExpression_1 = typescript_1.factory.createPropertyAccessExpression(beanAccessExpression_1, typescript_1.factory.createIdentifier(beanDescriptor.nestedProperty));
+        }
+        return beanAccessExpression_1;
     }
     var globalContextIdentifier = (0, getGlobalContextIdentifierFromArrayOrCreateNewAndPush_1.getGlobalContextIdentifierFromArrayOrCreateNewAndPush)(beanDescriptor.contextDescriptor, contextDescriptorToIdentifierList);
-    return typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(globalContextIdentifier, typescript_1.factory.createIdentifier(globalContextIdentifier.text)), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(beanDescriptor.classMemberName)]);
+    var beanAccessExpression = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(globalContextIdentifier, typescript_1.factory.createIdentifier(globalContextIdentifier.text)), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(beanDescriptor.classMemberName)]);
+    if (beanDescriptor.nestedProperty !== null) {
+        beanAccessExpression = typescript_1.factory.createPropertyAccessExpression(beanAccessExpression, typescript_1.factory.createIdentifier(beanDescriptor.nestedProperty));
+    }
+    return beanAccessExpression;
 }
@@ -52,0 +60,0 @@ exports.buildBeanCallExpressionForSingleBeanForLifecycle = buildBeanCallExpressionForSingleBeanForLifecycle;

core/build-context/transformers/getCallExpressionForBean.js

@@ -10,19 +10,25 @@ "use strict";
     if ((0, isBeanDependencyFromCurrentContext_1.isBeanDependencyFromCurrentContext)(qualifiedBean, dependencyParentBean)) {
-        var callExpression_1 = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createThis(), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(qualifiedBean.classMemberName)]);
+        var beanAccessExpression_1 = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createThis(), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(qualifiedBean.classMemberName)]);
+        if (qualifiedBean.nestedProperty !== null) {
+            beanAccessExpression_1 = typescript_1.factory.createPropertyAccessExpression(beanAccessExpression_1, typescript_1.factory.createIdentifier(qualifiedBean.nestedProperty));
+        }
         if (qualifiedBean.qualifiedType.kind === QualifiedType_1.QualifiedTypeKind.LIST) {
-            return typescript_1.factory.createSpreadElement(callExpression_1);
+            return typescript_1.factory.createSpreadElement(beanAccessExpression_1);
         }
         else {
-            return callExpression_1;
+            return beanAccessExpression_1;
         }
     }
     var globalContextIdentifier = (0, getGlobalContextIdentifierFromArrayOrCreateNewAndPush_1.getGlobalContextIdentifierFromArrayOrCreateNewAndPush)(qualifiedBean.contextDescriptor, contextDescriptorToIdentifierList);
-    var callExpression = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(globalContextIdentifier, typescript_1.factory.createIdentifier(globalContextIdentifier.text)), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(qualifiedBean.classMemberName)]);
+    var beanAccessExpression = typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(globalContextIdentifier, typescript_1.factory.createIdentifier(globalContextIdentifier.text)), typescript_1.factory.createIdentifier('getPrivateBean')), undefined, [typescript_1.factory.createStringLiteral(qualifiedBean.classMemberName)]);
+    if (qualifiedBean.nestedProperty !== null) {
+        beanAccessExpression = typescript_1.factory.createPropertyAccessExpression(beanAccessExpression, typescript_1.factory.createIdentifier(qualifiedBean.nestedProperty));
+    }
     if (qualifiedBean.qualifiedType.kind === QualifiedType_1.QualifiedTypeKind.LIST) {
-        return typescript_1.factory.createSpreadElement(callExpression);
+        return typescript_1.factory.createSpreadElement(beanAccessExpression);
     }
     else {
-        return callExpression;
+        return beanAccessExpression;
     }
 };
 exports.getCallExpressionForBean = getCallExpressionForBean;

core/connect-dependencies/buildDependencyGraphAndFillQualifiedBeans.js

@@ -69,15 +69,23 @@ "use strict";
                 if (dependencyDescriptor.qualifiedType.kind === QualifiedType_1.QualifiedTypeKind.PLAIN) {
-                    var nonUniqBeanDescriptorsFromCurrentContext = ((_d = beansMap.get(dependencyDescriptor.qualifiedType.fullTypeId)) !== null && _d !== void 0 ? _d : [])
+                    var currentContextBeans = (_d = beansMap.get(dependencyDescriptor.qualifiedType.fullTypeId)) !== null && _d !== void 0 ? _d : [];
+                    var currentContextNonEmbeddedBeans = currentContextBeans
+                        .filter(function (it) { return it !== beanDescriptor && it.beanKind !== 'embedded'; });
+                    var currentContextEmbeddedBeans = currentContextBeans
+                        .filter(function (it) { return it !== beanDescriptor && it.beanKind === 'embedded'; });
+                    var globalContextBeans = ((_f = (_e = BeanRepository_1.BeanRepository.beanDescriptorRepository.get(constants_1.GLOBAL_CONTEXT_NAME)) === null || _e === void 0 ? void 0 : _e.get(dependencyDescriptor.qualifiedType.fullTypeId)) !== null && _f !== void 0 ? _f : [])
                         .filter(function (it) { return it !== beanDescriptor; });
-                    var nonUniqBeanDescriptorsFromGlobalContext = ((_f = (_e = BeanRepository_1.BeanRepository.beanDescriptorRepository.get(constants_1.GLOBAL_CONTEXT_NAME)) === null || _e === void 0 ? void 0 : _e.get(dependencyDescriptor.qualifiedType.fullTypeId)) !== null && _f !== void 0 ? _f : [])
-                        .filter(function (it) { return it !== beanDescriptor; });
-                    var beanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(nonUniqBeanDescriptorsFromCurrentContext);
-                    var beanCandidatesFromGlobalContext = (0, uniqNotEmpty_1.uniqNotEmpty)(nonUniqBeanDescriptorsFromGlobalContext);
+                    var nonEmbeddedBeanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(currentContextNonEmbeddedBeans);
+                    var embeddedBeanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(currentContextEmbeddedBeans);
+                    var beanCandidatesFromGlobalContext = (0, uniqNotEmpty_1.uniqNotEmpty)(globalContextBeans);
                     if (dependencyDescriptor.qualifier !== null) {
-                        beanCandidatesFromCurrentContext = beanCandidatesFromCurrentContext
+                        nonEmbeddedBeanCandidatesFromCurrentContext = nonEmbeddedBeanCandidatesFromCurrentContext
                             .filter(function (it) { return it.classMemberName === dependencyDescriptor.qualifier; });
+                        embeddedBeanCandidatesFromCurrentContext = embeddedBeanCandidatesFromCurrentContext
+                            .filter(function (it) { return it.nestedProperty === dependencyDescriptor.qualifier; });
                         beanCandidatesFromGlobalContext = beanCandidatesFromGlobalContext
                             .filter(function (it) { return it.classMemberName === dependencyDescriptor.qualifier; });
                     }
-                    if (beanCandidatesFromCurrentContext.length === 0 && beanCandidatesFromGlobalContext.length === 0) {
+                    if (nonEmbeddedBeanCandidatesFromCurrentContext.length === 0
+                        && embeddedBeanCandidatesFromCurrentContext.length === 0
+                        && beanCandidatesFromGlobalContext.length === 0) {
                         CompilationContext_1.CompilationContext.reportError({
@@ -91,9 +99,9 @@ node: dependencyDescriptor.node,
                     }
-                    if (beanCandidatesFromCurrentContext.length === 1) {
-                        dependencyDescriptor.qualifiedBeans.add(beanCandidatesFromCurrentContext[0]);
-                        DependencyGraph_1.DependencyGraph.addNodeWithEdges(beanDescriptor, beanCandidatesFromCurrentContext);
+                    if (nonEmbeddedBeanCandidatesFromCurrentContext.length === 1) {
+                        dependencyDescriptor.qualifiedBeans.add(nonEmbeddedBeanCandidatesFromCurrentContext[0]);
+                        DependencyGraph_1.DependencyGraph.addNodeWithEdges(beanDescriptor, nonEmbeddedBeanCandidatesFromCurrentContext);
                         return;
                     }
-                    if (beanCandidatesFromCurrentContext.length > 1) {
-                        var beanCandidatesFromCurrentContextQualifiedByParameterName = beanCandidatesFromCurrentContext
+                    if (nonEmbeddedBeanCandidatesFromCurrentContext.length > 1) {
+                        var beanCandidatesFromCurrentContextQualifiedByParameterName = nonEmbeddedBeanCandidatesFromCurrentContext
                             .filter(function (it) { return it.classMemberName === dependencyDescriptor.parameterName; });
@@ -119,4 +127,4 @@ if (beanCandidatesFromCurrentContextQualifiedByParameterName.length === 1) {
                                 dependencyDescriptor.node
-                            ], __read(beanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
-                            message: "Found " + beanCandidatesFromCurrentContext.length + " Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
+                            ], __read(nonEmbeddedBeanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
+                            message: "Found " + nonEmbeddedBeanCandidatesFromCurrentContext.length + " Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
                             filePath: beanDescriptor.contextDescriptor.absolutePath,
@@ -127,2 +135,36 @@ relatedContextPath: beanDescriptor.contextDescriptor.absolutePath,
                     }
+                    if (embeddedBeanCandidatesFromCurrentContext.length === 1) {
+                        dependencyDescriptor.qualifiedBeans.add(embeddedBeanCandidatesFromCurrentContext[0]);
+                        DependencyGraph_1.DependencyGraph.addNodeWithEdges(beanDescriptor, embeddedBeanCandidatesFromCurrentContext);
+                        return;
+                    }
+                    if (embeddedBeanCandidatesFromCurrentContext.length > 1) {
+                        var beansByParameterName = embeddedBeanCandidatesFromCurrentContext
+                            .filter(function (it) { return it.nestedProperty === dependencyDescriptor.parameterName; });
+                        if (beansByParameterName.length === 1) {
+                            dependencyDescriptor.qualifiedBeans.add(beansByParameterName[0]);
+                            DependencyGraph_1.DependencyGraph.addNodeWithEdges(beanDescriptor, beansByParameterName);
+                            return;
+                        }
+                        if (beansByParameterName.length > 1) {
+                            CompilationContext_1.CompilationContext.reportErrorWithMultipleNodes({
+                                nodes: __spreadArray([
+                                    dependencyDescriptor.node
+                                ], __read(beansByParameterName.map(function (it) { return it.node; })), false),
+                                message: "Found " + beansByParameterName.length + " Embedded Bean candidates, with same name, please rename one of beans",
+                                filePath: beanDescriptor.contextDescriptor.absolutePath,
+                                relatedContextPath: beanDescriptor.contextDescriptor.absolutePath,
+                            });
+                            return;
+                        }
+                        CompilationContext_1.CompilationContext.reportErrorWithMultipleNodes({
+                            nodes: __spreadArray([
+                                dependencyDescriptor.node
+                            ], __read(embeddedBeanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
+                            message: "Found " + embeddedBeanCandidatesFromCurrentContext.length + " Embedded Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
+                            filePath: beanDescriptor.contextDescriptor.absolutePath,
+                            relatedContextPath: beanDescriptor.contextDescriptor.absolutePath,
+                        });
+                        return;
+                    }
                     if (beanCandidatesFromGlobalContext.length === 1) {
@@ -129,0 +171,0 @@ dependencyDescriptor.qualifiedBeans.add(beanCandidatesFromGlobalContext[0]);

core/context-lifecycle/registerLifecycleExpression.js

@@ -95,14 +95,21 @@ "use strict";
         if (qualifiedType.kind === QualifiedType_1.QualifiedTypeKind.PLAIN) {
-            var nonUniqBeanDescriptorsFromCurrentContext = (_d = beansMap.get(qualifiedType.fullTypeId)) !== null && _d !== void 0 ? _d : [];
+            var currentContextBeans = (_d = beansMap.get(qualifiedType.fullTypeId)) !== null && _d !== void 0 ? _d : [];
+            var currentContextNonEmbeddedBeans = currentContextBeans.filter(function (it) { return it.beanKind !== 'embedded'; });
+            var currentContextEmbeddedBeans = currentContextBeans.filter(function (it) { return it.beanKind === 'embedded'; });
             var nonUniqBeanDescriptorsFromGlobalContext = (_f = (_e = BeanRepository_1.BeanRepository
                 .beanDescriptorRepository.get(constants_1.GLOBAL_CONTEXT_NAME)) === null || _e === void 0 ? void 0 : _e.get(qualifiedType.fullTypeId)) !== null && _f !== void 0 ? _f : [];
-            var beanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(nonUniqBeanDescriptorsFromCurrentContext);
+            var nonEmbeddedBeanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(currentContextNonEmbeddedBeans);
+            var embeddedBeanCandidatesFromCurrentContext = (0, uniqNotEmpty_1.uniqNotEmpty)(currentContextEmbeddedBeans);
             var beanCandidatesFromGlobalContext = (0, uniqNotEmpty_1.uniqNotEmpty)(nonUniqBeanDescriptorsFromGlobalContext);
             if (qualifier !== null) {
-                beanCandidatesFromCurrentContext = beanCandidatesFromCurrentContext
+                nonEmbeddedBeanCandidatesFromCurrentContext = nonEmbeddedBeanCandidatesFromCurrentContext
                     .filter(function (it) { return it.classMemberName === qualifier; });
+                embeddedBeanCandidatesFromCurrentContext = embeddedBeanCandidatesFromCurrentContext
+                    .filter(function (it) { return it.nestedProperty === qualifier; });
                 beanCandidatesFromGlobalContext = beanCandidatesFromGlobalContext
                     .filter(function (it) { return it.classMemberName === qualifier; });
             }
-            if (beanCandidatesFromCurrentContext.length === 0 && beanCandidatesFromGlobalContext.length === 0) {
+            if (nonEmbeddedBeanCandidatesFromCurrentContext.length === 0
+                && embeddedBeanCandidatesFromCurrentContext.length === 0
+                && beanCandidatesFromGlobalContext.length === 0) {
                 CompilationContext_1.CompilationContext.reportError({
@@ -116,12 +123,12 @@ node: parameter,
             }
-            if (beanCandidatesFromCurrentContext.length === 1) {
+            if (nonEmbeddedBeanCandidatesFromCurrentContext.length === 1) {
                 dependencies.add({
                     parameterName: parameterName,
                     qualifiedType: qualifiedType,
-                    beanDescriptors: new ExtendedSet_1.ExtendedSet(beanCandidatesFromCurrentContext),
+                    beanDescriptors: new ExtendedSet_1.ExtendedSet(nonEmbeddedBeanCandidatesFromCurrentContext),
                 });
                 return;
             }
-            if (beanCandidatesFromCurrentContext.length > 1) {
-                var beanCandidatesFromCurrentContextQualifiedByParameterName = beanCandidatesFromCurrentContext
+            if (nonEmbeddedBeanCandidatesFromCurrentContext.length > 1) {
+                var beanCandidatesFromCurrentContextQualifiedByParameterName = nonEmbeddedBeanCandidatesFromCurrentContext
                     .filter(function (it) { return it.classMemberName === parameterName; });
@@ -150,4 +157,4 @@ if (beanCandidatesFromCurrentContextQualifiedByParameterName.length === 1) {
                         parameter
-                    ], __read(beanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
-                    message: "Found " + beanCandidatesFromCurrentContext.length + " Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
+                    ], __read(nonEmbeddedBeanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
+                    message: "Found " + nonEmbeddedBeanCandidatesFromCurrentContext.length + " Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
                     filePath: contextDescriptor.absolutePath,
@@ -158,2 +165,42 @@ relatedContextPath: contextDescriptor.absolutePath,
             }
+            if (embeddedBeanCandidatesFromCurrentContext.length === 1) {
+                dependencies.add({
+                    parameterName: parameterName,
+                    qualifiedType: qualifiedType,
+                    beanDescriptors: new ExtendedSet_1.ExtendedSet(embeddedBeanCandidatesFromCurrentContext),
+                });
+                return;
+            }
+            if (embeddedBeanCandidatesFromCurrentContext.length > 1) {
+                var beansByParameterName = embeddedBeanCandidatesFromCurrentContext
+                    .filter(function (it) { return it.nestedProperty === parameterName; });
+                if (beansByParameterName.length === 1) {
+                    dependencies.add({
+                        parameterName: parameterName,
+                        qualifiedType: qualifiedType,
+                        beanDescriptors: new ExtendedSet_1.ExtendedSet(beansByParameterName)
+                    });
+                    return;
+                }
+                if (beansByParameterName.length > 1) {
+                    CompilationContext_1.CompilationContext.reportErrorWithMultipleNodes({
+                        nodes: __spreadArray([
+                            parameter
+                        ], __read(beansByParameterName.map(function (it) { return it.node; })), false),
+                        message: "Found " + beansByParameterName.length + " Bean candidates, with same name, please rename one of beans",
+                        filePath: contextDescriptor.absolutePath,
+                        relatedContextPath: contextDescriptor.absolutePath,
+                    });
+                    return;
+                }
+                CompilationContext_1.CompilationContext.reportErrorWithMultipleNodes({
+                    nodes: __spreadArray([
+                        parameter
+                    ], __read(embeddedBeanCandidatesFromCurrentContext.map(function (it) { return it.node; })), false),
+                    message: "Found " + embeddedBeanCandidatesFromCurrentContext.length + " Bean candidates, please use @Qualifier or rename parameter to match bean name, to specify which Bean should be injected",
+                    filePath: contextDescriptor.absolutePath,
+                    relatedContextPath: contextDescriptor.absolutePath,
+                });
+                return;
+            }
             if (beanCandidatesFromGlobalContext.length === 1) {
@@ -160,0 +207,0 @@ dependencies.add({

external/decorators/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BeforeDestruct = exports.PostConstruct = exports.Qualifier = exports.Bean = void 0;
+exports.EmbeddedBean = exports.BeforeDestruct = exports.PostConstruct = exports.Qualifier = exports.Bean = void 0;
 var Bean_1 = require("./Bean");
@@ -12,1 +12,3 @@ Object.defineProperty(exports, "Bean", { enumerable: true, get: function () { return Bean_1.Bean; } });
 Object.defineProperty(exports, "BeforeDestruct", { enumerable: true, get: function () { return BeforeDesctruct_1.BeforeDestruct; } });
+var EmbeddedBean_1 = require("./EmbeddedBean");
+Object.defineProperty(exports, "EmbeddedBean", { enumerable: true, get: function () { return EmbeddedBean_1.EmbeddedBean; } });

index.d.ts

@@ -56,3 +56,5 @@ export interface IDIContext<TBeans> {
 export declare const BeforeDestruct: TBeforeDestruct;
+export declare type TEmbeddedBean = PropertyDecorator;
+export declare const EmbeddedBean: TEmbeddedBean;
 
 export {};

package.json

 {
   "name": "dependency-injection-cat",
-  "version": "0.0.17-beta",
+  "version": "0.0.18-beta",
   "main": "index.js",
@@ -5,0 +5,0 @@ "types": "index.d.ts",

plugins/webpack/index.d.ts

@@ -8,2 +8,4 @@ /// <reference types="estree" />
 export default class DICatWebpackPlugin {
+	private static isErrorsHandledByWebpack;
+	constructor();
 	apply(compiler: Compiler): void;
@@ -10,0 +12,0 @@ }

plugins/webpack/index.js

@@ -53,2 +53,3 @@ "use strict";
     function DICatWebpackPlugin() {
+        DICatWebpackPlugin.isErrorsHandledByWebpack = true;
     }
@@ -100,2 +101,3 @@ DICatWebpackPlugin.prototype.apply = function (compiler) {
     };
+    DICatWebpackPlugin.isErrorsHandledByWebpack = false;
     return DICatWebpackPlugin;
@@ -102,0 +104,0 @@ }());

transformers/typescript/index.js

 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -7,2 +10,4 @@ var config_1 = require("../../external/config");
 var CompilationContext_1 = require("../../compilation-context/CompilationContext");
+var webpack_1 = __importDefault(require("../../plugins/webpack"));
+var lodash_1 = require("lodash");
 exports.default = (function (program, config) {
@@ -14,5 +19,7 @@ (0, config_1.initDiConfig)(config);
         var transformedSourceFile = transformerFactory(context)(sourceFile);
-        var errorMessage = CompilationContext_1.CompilationContext.getErrorMessage();
-        if (errorMessage !== null) {
-            throw new Error(errorMessage);
+        if (!(0, lodash_1.get)(webpack_1.default, 'isErrorsHandledByWebpack')) {
+            var errorMessage = CompilationContext_1.CompilationContext.getErrorMessage();
+            if (errorMessage !== null) {
+                throw new Error(errorMessage);
+            }
         }
@@ -19,0 +26,0 @@ return transformedSourceFile;

No alert changes

Improved metrics

Total package byte prevSize

340044

increased by6.01%

Number of package files

148

increased by2.78%

Lines of code

6257

increased by6.03%

No dependency changes