dependency-injection-cat - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

CHANGELOG.md

 # Changelog
 
+## 1.0.1
+
+- [Improvement] Allow container access inside files with context
+
 ## 1.0.0
@@ -4,0 +8,0 @@

core/bean/BeanRepository.js

@@ -65,5 +65,4 @@ "use strict";
         this.beanNodeToBeanDescriptorMap.set(descriptorWithId.node, descriptorWithId);
-        var contextDescriptors = (_b = this.contextIdToBeanDescriptorsMap.get(descriptor.contextDescriptor.id)) !== null && _b !== void 0 ? _b : null;
-        if (contextDescriptors === null) {
-            contextDescriptors = [];
+        var contextDescriptors = (_b = this.contextIdToBeanDescriptorsMap.get(descriptor.contextDescriptor.id)) !== null && _b !== void 0 ? _b : [];
+        if (!this.contextIdToBeanDescriptorsMap.has(descriptor.contextDescriptor.id)) {
             this.contextIdToBeanDescriptorsMap.set(descriptor.contextDescriptor.id, contextDescriptors);
@@ -70,0 +69,0 @@ }

core/build-context/registerAndTransformContext.js

@@ -21,3 +21,2 @@ "use strict";
 var CompilationContext_1 = require("../../compilation-context/CompilationContext");
-var registerGlobalBeans_1 = require("../bean/registerGlobalBeans");
 var registerGlobalCatContext_1 = require("../context/registerGlobalCatContext");
@@ -42,3 +41,3 @@ var addGlobalContextInstance_1 = require("./transformers/addGlobalContextInstance");
         }
-        (0, registerGlobalBeans_1.registerGlobalBeans)(newGlobalContextDescriptor);
+        (0, registerBeans_1.registerBeans)(newGlobalContextDescriptor);
         (0, registerBeanDependencies_1.registerBeanDependencies)(newGlobalContextDescriptor);
@@ -45,0 +44,0 @@ (0, buildDependencyGraphAndFillQualifiedBeans_1.buildDependencyGraphAndFillQualifiedBeans)(newGlobalContextDescriptor);

core/initContexts.js

@@ -31,6 +31,6 @@ "use strict";
 var getContextPaths_1 = require("./context/getContextPaths");
-var registerGlobalBeans_1 = require("./bean/registerGlobalBeans");
 var ContextRepository_1 = require("./context/ContextRepository");
 var typescript_1 = __importStar(require("typescript"));
 var fs_1 = __importDefault(require("fs"));
+var registerBeans_1 = require("./bean/registerBeans");
 var wasInitiated = false;
@@ -48,4 +48,4 @@ var initContexts = function () {
         .forEach(registerGlobalCatContext_1.registerGlobalCatContext);
-    ContextRepository_1.ContextRepository.globalContexts.forEach(registerGlobalBeans_1.registerGlobalBeans);
+    ContextRepository_1.ContextRepository.globalContexts.forEach(registerBeans_1.registerBeans);
 };
 exports.initContexts = initContexts;

core/transformers/getTransformerFactory.js

@@ -61,5 +61,5 @@ "use strict";
     return function (sourceFile) {
+        var transformedSourceFile = sourceFile;
         if ((0, minimatch_1.default)(sourceFile.fileName, config_1.diConfig.diConfigPattern)) {
-            var transformedContext = (0, registerAndTransformContext_1.registerAndTransformContext)(context, sourceFile);
-            return transformedContext;
+            transformedSourceFile = (0, registerAndTransformContext_1.registerAndTransformContext)(context, transformedSourceFile);
         }
@@ -73,3 +73,3 @@ var factoryImportsToAdd = [];
         });
-        var newSourceFile = typescript_1.default.visitNode(sourceFile, visitor);
+        var newSourceFile = typescript_1.default.visitNode(transformedSourceFile, visitor);
         var uniqFactoryImportsToAdd = (0, lodash_1.uniqBy)(factoryImportsToAdd, function (it) {
@@ -80,5 +80,5 @@ if (typescript_1.default.isStringLiteral(it.moduleSpecifier)) {
         });
-        return typescript_1.factory.updateSourceFile(sourceFile, __spreadArray(__spreadArray([], __read(uniqFactoryImportsToAdd), false), __read(newSourceFile.statements), false), sourceFile.isDeclarationFile, sourceFile.referencedFiles, undefined, sourceFile.hasNoDefaultLib, undefined);
+        return typescript_1.factory.updateSourceFile(transformedSourceFile, __spreadArray(__spreadArray([], __read(uniqFactoryImportsToAdd), false), __read(newSourceFile.statements), false), sourceFile.isDeclarationFile, sourceFile.referencedFiles, undefined, sourceFile.hasNoDefaultLib, undefined);
     };
 }; };
 exports.getTransformerFactory = getTransformerFactory;

core/ts-helpers/type-qualifier/TypeQualifier.js

@@ -44,5 +44,5 @@ "use strict";
 * InferTypeNode - method<T>(): T
+* TypeLiteralNode - {} with some members. Should allow it?
 * */
 /* TypeNodes that is allowed
-* TypeLiteralNode - {} with some members. Should allow it?
 * UnionTypeNode - Should allow it?  // A | B | C
@@ -49,0 +49,0 @@ *

external/InternalCatContext.js

@@ -64,5 +64,4 @@ "use strict";
         }
-        var savedInstance = (_a = this.singletonMap.get(beanName)) !== null && _a !== void 0 ? _a : null;
-        if (savedInstance === null) {
-            savedInstance = this[beanName]();
+        var savedInstance = (_a = this.singletonMap.get(beanName)) !== null && _a !== void 0 ? _a : this[beanName]();
+        if (!this.singletonMap.has(beanName)) {
             this.singletonMap.set(beanName, savedInstance);
@@ -69,0 +68,0 @@ }

package.json

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

plugins/typescript/ReportErrorsTypescriptPlugin.js

 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var CompilationContext_1 = require("../../compilation-context/CompilationContext");
-var CompilationError_1 = require("../../compilation-context/CompilationError");
-exports.default = (function () {
-    return (function (context) {
-        return function (node) {
-            var message = CompilationContext_1.CompilationContext.getErrorMessage();
-            if (message !== null) {
-                throw new CompilationError_1.CompilationError(message);
-            }
-            return node;
-        };
-    });
-});
+var chalk_1 = __importDefault(require("chalk"));
+console.log(chalk_1.default.yellow('ReportErrorsTypescriptPlugin is deprecated, please remove it from your tsconfig.json'));
+exports.default = (function () { return function (context) { return function (node) { return node; }; }; });

README.md

@@ -209,5 +209,2 @@ # Dependency Injection Cat
         //Here is configuration options, see below
-      },
-      {
-        "transform": "dependency-injection-cat/plugins/typescript/ReportErrorsTypescriptPlugin"
       }
@@ -214,0 +211,0 @@ ]

transformers/typescript/index.js

@@ -6,6 +6,15 @@ "use strict";
 var initContexts_1 = require("../../core/initContexts");
+var CompilationContext_1 = require("../../compilation-context/CompilationContext");
 exports.default = (function (program, config) {
     (0, config_1.initDiConfig)(config);
     (0, initContexts_1.initContexts)();
-    return (0, getTransformerFactory_1.getTransformerFactory)();
+    var transformerFactory = (0, getTransformerFactory_1.getTransformerFactory)();
+    return function (context) { return function (sourceFile) {
+        var transformedSourceFile = transformerFactory(context)(sourceFile);
+        var errorMessage = CompilationContext_1.CompilationContext.getErrorMessage();
+        if (errorMessage !== null) {
+            throw new Error(errorMessage);
+        }
+        return transformedSourceFile;
+    }; };
 });

No alert changes

Worsened metrics

Total package byte prevSize

320751

decreased by-0.46%

Number of package files

144

decreased by-0.69%

Lines of code

5901

decreased by-0.52%

Number of lines in readme file

736

decreased by-0.41%

No dependency changes