fix: new loggedroute

dist/lib/logged.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logged.d.ts","sourceRoot":"","sources":["../../src/logged.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EACb,MAAM,gBAAgB,CAAC;AAmBxB,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,YAAY,YACrC,GAAG,UAqBpB;AAED,wBAAgB,gBAAgB,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AAC1D,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GACxB,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AACzB,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,GACzB,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AA0BzB,wBAAgB,cAAc,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EACpD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,uBAAuB,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,QA4EhE;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,aAEtD,GAAG,OACP,MAAM,gDACmC,CAAC,KAAK,QAAQ,CAAC,CAAC,WAsEjE"}
+{"version":3,"file":"logged.d.ts","sourceRoot":"","sources":["../../src/logged.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EACb,MAAM,gBAAgB,CAAC;AAmBxB,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,YAAY,YACrC,GAAG,UAqBpB;AAED,wBAAgB,gBAAgB,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AAC1D,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GACxB,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AACzB,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,GACzB,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;AA6BzB,wBAAgB,cAAc,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EACpD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,uBAAuB,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,QA2EhE;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,aAEtD,GAAG,OACP,MAAM,gDACmC,CAAC,KAAK,QAAQ,CAAC,CAAC,WA0EjE"}

dist/lib/logged.js

@@ -19,7 +19,6 @@ function loggerInit(_target) {
 }
 function LoggedInjectable(options) {
     return (target) => {
-        target = (0, common_1.Injectable)(options)(target);
         loggerInit(target.prototype);
         const logger = target.prototype.logger;
         const methods = Object.getOwnPropertyNames(target.prototype);
@@ -32,16 +31,18 @@ function LoggedInjectable(options) {
                 });
             }
         });
+        (0, common_1.Injectable)(options)(target);
     };
 }
 exports.LoggedInjectable = LoggedInjectable;
 function LoggedController(param) {
     return (target) => {
-        target = (0, common_1.Controller)(param)(target);
         loggerInit(target.prototype);
         const logger = target.prototype.logger;
         const methods = Object.getOwnPropertyNames(target.prototype);
+        logger.log(JSON.stringify(methods));
         methods.forEach((method) => {
+            logger.log(method);
             if (method !== "constructor" &&
                 typeof target.prototype[method] === "function") {
                 logger.log(`LoggedRoute applied to ${method}`);
@@ -50,6 +51,7 @@ function LoggedController(param) {
                 });
             }
         });
+        (0, common_1.Controller)(param)(target);
     };
 }
 exports.LoggedController = LoggedController;
@@ -102,9 +104,11 @@ function LoggedRoute(route) {
         const logger = _target.logger;
         let fullRoute = `${_target.constructor.name}/`;
         const fn = descriptor.value;
-        if (!fn)
+        if (!fn || typeof fn !== "function") {
+            logger.warn(`LoggedRoute decorator applied to non-function property: ${key}`);
             return;
-        descriptor.value = async function (...args) {
+        }
+        _target[key] = async function (...args) {
             const scopedLoggerInjectableParam = Reflect.getOwnMetadata(reflected_1.scopedLogger, _target, key);
             fullRoute += route || Reflect.getMetadata("path", fn);
             if (typeof scopedLoggerInjectableParam !== "undefined" &&

src/logged.ts

@@ -25,8 +25,6 @@ function loggerInit(_target: any) {
 
 export function LoggedInjectable(options?: ScopeOptions) {
   return (target: any) => {
-    target = Injectable(options)(target);
-
     loggerInit(target.prototype);
 
     const logger = target.prototype.logger;
@@ -44,6 +42,8 @@ export function LoggedInjectable(options?: ScopeOptions) {
         });
       }
     });
+
+    Injectable(options)(target);
   };
 }
 
@@ -57,15 +57,16 @@ export function LoggedController(
 
 export function LoggedController(param?: any): (target: any) => void {
   return (target: any) => {
-    target = Controller(param)(target);
-
     loggerInit(target.prototype);
 
     const logger = target.prototype.logger;
 
     const methods = Object.getOwnPropertyNames(target.prototype);
 
+    logger.log(JSON.stringify(methods))
+
     methods.forEach((method) => {
+      logger.log(method)
       if (
         method !== "constructor" &&
         typeof target.prototype[method] === "function"
@@ -76,6 +77,8 @@ export function LoggedController(param?: any): (target: any) => void {
         });
       }
     });
+
+    Controller(param)(target);
   };
 }
 
@@ -97,7 +100,7 @@ export function LoggedFunction<F extends Array<any>, R>(
     return;
   }
 
-  _target[key] = async function (...args: F) {
+  _target[key] = async function(...args: F) {
     const scopedLoggerInjectableParam: number = Reflect.getOwnMetadata(
       scopedLogger,
       _target,
@@ -129,23 +132,22 @@ export function LoggedFunction<F extends Array<any>, R>(
     );
 
     injectedLogger.log(
-      `CALL ${key} ${
+      `CALL ${key} ${loggedParams && loggedParams.length > 0
-        loggedParams && loggedParams.length > 0
+        ? "WITH " +
-          ? "WITH " +
+        (
-            (
+          await Promise.all(
-              await Promise.all(
+            loggedParams.map(
-                loggedParams.map(
+              async ({ name, index, include, exclude }) =>
-                  async ({ name, index, include, exclude }) =>
+                name +
-                    name +
+                "=" +
-                    "=" +
+                (await objectContainedLogged(args[index], {
-                    (await objectContainedLogged(args[index], {
+                  include,
-                      include,
+                  exclude,
-                      exclude,
+                }))
-                    }))
+            )
-                )
+          )
-              )
+        ).join(", ")
-            ).join(", ")
+        : ""
-          : ""
       }`
     );
 
@@ -173,9 +175,14 @@ export function LoggedRoute<F extends Array<any>, R>(route?: string) {
     let fullRoute = `${_target.constructor.name}/`;
     const fn = descriptor.value;
 
-    if (!fn) return;
+    if (!fn || typeof fn !== "function") {
+      logger.warn(
+        `LoggedRoute decorator applied to non-function property: ${key}`
+      );
+      return;
+    }
 
-    descriptor.value = async function (...args: F) {
+    _target[key] = async function(...args: F) {
       const scopedLoggerInjectableParam: number = Reflect.getOwnMetadata(
         scopedLogger,
         _target,
@@ -204,23 +211,22 @@ export function LoggedRoute<F extends Array<any>, R>(route?: string) {
       );
 
       injectedLogger.log(
-        `HIT HTTP ${fullRoute} (${key}) ${
+        `HIT HTTP ${fullRoute} (${key}) ${loggedParams && loggedParams.length > 0
-          loggedParams && loggedParams.length > 0
+          ? "WITH " +
-            ? "WITH " +
+          (
-              (
+            await Promise.all(
-                await Promise.all(
+              loggedParams.map(
-                  loggedParams.map(
+                async ({ name, index, include, exclude }) =>
-                    async ({ name, index, include, exclude }) =>
+                  name +
-                      name +
+                  "=" +
-                      "=" +
+                  (await objectContainedLogged(args[index], {
-                      (await objectContainedLogged(args[index], {
+                    include,
-                        include,
+                    exclude,
-                        exclude,
+                  }))
-                      }))
+              )
-                  )
+            )
-                )
+          ).join(", ")
-              ).join(", ")
+          : ""
-            : ""
         }`
       );