@bool-ts/core 1.0.4 → 1.0.6

package/__test/module.ts

@@ -1,6 +1,6 @@
 import { Module } from "../src";
 import { TestController } from "./controller";
-import { TestRepository } from "./repository";
+// import { TestRepository } from "./repository";
 import { TestService } from "./service";
 
 @Module({
@@ -8,7 +8,7 @@ import { TestService } from "./service";
         TestController
     ],
     dependencies: [
-        TestService,
+        // TestService,
         // TestRepository
     ]
 })

package/dist/hooks/injector.js

@@ -7,19 +7,18 @@ export const Injector = new class {
      * @param constructor
      */
     get(target) {
-        if (this._mapper.has(target)) {
-            return this._mapper.get(target);
+        if (this._mapper.has(target.constructor)) {
+            return this._mapper.get(target.constructor);
         }
-        const ownMetadataKeys = Reflect.getOwnMetadataKeys(target);
+        const ownMetadataKeys = Reflect.getOwnMetadataKeys(target.constructor);
         if (!ownMetadataKeys.includes(injectableKey)) {
-            console.error("Current metadata keys:", ownMetadataKeys, Reflect.getOwnMetadataKeys(target.constructor));
             throw Error("Missing dependency declaration, please check @Injectable() used on dependency(ies).");
         }
         // Initialize dependencies injection
         const dependencies = Reflect.getOwnMetadata("design:paramtypes", target) || [];
         const injections = dependencies.map(dependency => Injector.get(dependency));
-        const instance = new target(...injections);
-        this._mapper.set(target, instance);
+        const instance = target.constructor(...injections);
+        this._mapper.set(target.constructor, instance);
         return instance;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bool-ts/core",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/hooks/factory.ts

@@ -70,6 +70,11 @@ export const BoolFactory = (
 
     const metadata = Reflect.getOwnMetadata(moduleKey, target) as TModuleOptions;
     const routers = !metadata?.controllers ? [] : metadata.controllers.map(controllerConstructor => controllerCreator(controllerConstructor));
+    const allowOrigins = !metadata?.allowOrigins ?
+        ["*"] : typeof metadata.allowOrigins !== "string" ?
+            metadata.allowOrigins : [metadata.allowOrigins];
+    const allowMethods = !metadata?.allowMethods ?
+        ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"] : metadata.allowMethods;
     const app = ExpressApp();
     const configs = Object.freeze({
         allowLogsMethods: [
@@ -143,31 +148,15 @@ export const BoolFactory = (
         })
     );
 
-    const allowOrigins = !metadata?.allowOrigins ?
-        ["*"] : typeof metadata.allowOrigins !== "string" ?
-            metadata.allowOrigins : [metadata.allowOrigins];
-
-    const allowMethods = !metadata?.allowMethods ?
-        ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"] : metadata.allowMethods;
-
     app.use((req: Request, res: Response, next: NextFunction) => {
-        if (!req.headers.origin) {
+        if (!allowOrigins.includes(req.headers.origin || "*")) {
             return res.status(403).json({
                 ["httpCode"]: 403,
-                ["data"]: "CORS Origin - Not found."
+                ["data"]: "Invalid origin."
             });
         }
 
-        if (!allowOrigins.includes("*")) {
-            if (!allowOrigins.includes(req.headers.origin)) {
-                return res.status(403).json({
-                    ["httpCode"]: 403,
-                    ["data"]: "Invalid origin."
-                });
-            }
-        }
-
-        res.header("Access-Control-Allow-Origin", req.headers.origin);
+        res.header("Access-Control-Allow-Origin", req.headers.origin || "*");
         res.header("Access-Control-Allow-Headers", "*");
         res.header("Access-Control-Allow-Credentials", "true");
         res.header("Access-Control-Allow-Methods", allowMethods.join(", "));

package/src/hooks/injector.ts

@@ -15,26 +15,25 @@ export const Injector: IInjector = new class {
      * 
      * @param constructor 
      */
-    get<T>(
-        target: new (...args: any[]) => T
+    get<T extends Object>(
+        target: T
     ) {
-        if (this._mapper.has(target)) {
-            return this._mapper.get(target) as T;
+        if (this._mapper.has(target.constructor)) {
+            return this._mapper.get(target.constructor) as T;
         }
 
-        const ownMetadataKeys = Reflect.getOwnMetadataKeys(target);
+        const ownMetadataKeys = Reflect.getOwnMetadataKeys(target.constructor);
 
         if (!ownMetadataKeys.includes(injectableKey)) {
-            console.error("Current metadata keys:", ownMetadataKeys, Reflect.getOwnMetadataKeys((target as Function).constructor));
             throw Error("Missing dependency declaration, please check @Injectable() used on dependency(ies).");
         }
 
         // Initialize dependencies injection
         const dependencies: any[] = Reflect.getOwnMetadata("design:paramtypes", target) || [];
         const injections: any[] = dependencies.map(dependency => Injector.get(dependency));
-        const instance = new target(...injections);
+        const instance = target.constructor(...injections);
 
-        this._mapper.set(target, instance);
+        this._mapper.set(target.constructor, instance);
 
         return instance;
     }