@cley_faye/boilerplate 3.10.1 → 3.11.1

package/lib/express/logger.d.ts

@@ -6,6 +6,7 @@ interface ErrorLoggerConfiguration {
     /** @deprecated Use collapseStacktrace */
     collapseNodeModules?: boolean;
     collapseStacktrace?: boolean;
+    extraFilter?: Array<RegExp> | RegExp;
 }
 export declare type ErrorLoggerOptions = ErrorLoggerConfiguration | boolean;
 export interface LoggingData {

package/lib/express/logger.js

@@ -88,8 +88,7 @@ const registerRouteLogger = (app, logOptions) => {
         requestWhitelist: ["body"],
         bodyWhitelist: [],
         expressFormat: false,
-        format: winston_1.default.format.combine(winston_1.default.format.colorize(), customRouteFormat(timestamp)),
-        colorize: true,
+        format: customRouteFormat(timestamp),
         msg: "{{req.method}} {{req.url}} {{res.statusCode}} {{res.responseTime}}ms",
     };
     app.use(express_winston_1.default.logger({
@@ -99,6 +98,14 @@ const registerRouteLogger = (app, logOptions) => {
     }));
 };
 exports.registerRouteLogger = registerRouteLogger;
+const getExtraFilter = (userExtraFilter) => {
+    const expressRegEx = /node_modules\/express/u;
+    if (!userExtraFilter)
+        return expressRegEx;
+    if (Array.isArray(userExtraFilter))
+        return [expressRegEx, ...userExtraFilter];
+    return [expressRegEx, userExtraFilter];
+};
 const registerErrorLogger = (app, logOptions) => {
     const { error, logger, timestamp } = logOptions ?? {};
     const config = typeof error === "boolean"
@@ -114,7 +121,7 @@ const registerErrorLogger = (app, logOptions) => {
     else {
         app.use(express_winston_1.default.errorLogger({
             transports: winston_js_1.transports,
-            format: (0, winston_js_1.customFormat)(timestamp, config.collapseStacktrace ?? config.collapseNodeModules),
+            format: (0, winston_js_1.customFormat)(timestamp, config.collapseStacktrace ?? config.collapseNodeModules, getExtraFilter(config.extraFilter)),
             meta: false,
         }));
     }

package/lib/express/pipelinebuilder.d.ts

@@ -30,6 +30,7 @@ export interface LogOptions {
     error?: ErrorLoggerOptions;
     logger?: winston.Logger;
     timestamp?: boolean;
+    extraStacktraceFilter?: Array<RegExp> | RegExp;
     userFromReq?: UserFromReqFunc;
 }
 export interface DefaultErrorHandlerConfig {

package/lib/grunt/reactapp/webpack.js

@@ -134,10 +134,8 @@ const getOutputToWatch = (webpackOptions, targetName) => {
     if (webpackOptions.output) {
         return null;
     }
-    const entries = webpackOptions.entry
-        ? Object.keys(webpackOptions.entry)
-        : [targetName];
-    return entries.map(entryName => (0, path_1.join)("dist", targetName, "js", `${entryName}.js`));
+    // Watch all output directory, since webpack generate chunks
+    return [(0, path_1.join)("dist", targetName, "js", "*.js")];
 };
 const getWatchTasks = (webpackOptions, targetName) => {
     const outputToWatch = getOutputToWatch(webpackOptions, targetName);

package/lib/winston.d.ts

@@ -3,7 +3,7 @@ import { Format } from "logform";
 /**
  * Collapse useless lines in stacktrace
  */
-export declare const filterStacktrace: (message: string) => Generator<string>;
+export declare const filterStacktrace: (message: string, extraFilter?: Array<RegExp> | RegExp) => Generator<string>;
 /**
  * Prefix all lines with the level and the timestamp if needed
  */
@@ -13,6 +13,7 @@ export interface LogConfig {
     /** @deprecated Use collapseStacktrace instead */
     collapseNodeModules: boolean;
     collapseStacktrace: boolean;
+    stacktraceFilter?: Array<RegExp> | RegExp;
 }
 interface ExtendedErrorFields {
     cause?: Error;
@@ -26,8 +27,8 @@ interface ExtendedErrorFields {
 }
 declare type ExtendedError = Error & ExtendedErrorFields;
 /** Return a string with the full error and stacktrace, including causes */
-export declare const filterError: (error: ExtendedError, collapseStacktrace?: boolean) => string;
-export declare const customFormat: (timestamp?: boolean, collapseStacktrace?: boolean) => Format;
+export declare const filterError: (error: ExtendedError, collapseStacktrace?: boolean, extraFilter?: Array<RegExp> | RegExp) => string;
+export declare const customFormat: (timestamp?: boolean, collapseStacktrace?: boolean, stacktraceFilter?: Array<RegExp> | RegExp) => Format;
 /** Edit the configuration applied to consoleLogger */
 export declare const setConfig: (config: LogConfig) => void;
 export declare const transports: winston.transports.ConsoleTransportInstance[];

package/lib/winston.js

@@ -31,17 +31,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLogger = exports.transports = exports.setConfig = exports.customFormat = exports.filterError = exports.prefixOutput = exports.filterStacktrace = void 0;
 const winston_1 = __importDefault(require("winston"));
-// High value because of colorize()
 const LOG_LEVEL_PADDING_SIZE = 10;
 const stackFilterRegex = /(?:at process|at runMicrotasks)/u;
+const isFiltered = (line, extraFilter) => {
+    if (stackFilterRegex.exec(line))
+        return true;
+    if (extraFilter) {
+        for (const filter of Array.isArray(extraFilter) ? extraFilter : [extraFilter]) {
+            if (filter.exec(line))
+                return true;
+        }
+    }
+    return false;
+};
 /**
  * Collapse useless lines in stacktrace
  */
-const filterStacktrace = function* (message) {
+const filterStacktrace = function* (message, extraFilter) {
     let inCollapse = false;
     const lines = message.split("\n");
     for (const line of lines) {
-        if (stackFilterRegex.exec(line)) {
+        if (isFiltered(line, extraFilter)) {
             if (!inCollapse) {
                 inCollapse = true;
                 yield "[...]";
@@ -71,6 +81,7 @@ const logConfig = {
     timestamp: true,
     collapseNodeModules: true,
     collapseStacktrace: true,
+    stacktraceFilter: undefined,
 };
 const indent = (msg, indentLevel) => {
     if (indentLevel === 0)
@@ -127,7 +138,7 @@ const addHttpErrorContent = (error) => {
     return `HttpError status: ${error.statusCode}`;
 };
 /** Return a string with the full error and stacktrace, including causes */
-const filterError = (error, collapseStacktrace = true) => {
+const filterError = (error, collapseStacktrace = true, extraFilter) => {
     const resultRows = [];
     let cursor = error;
     let indentLevel = 0;
@@ -141,7 +152,7 @@ const filterError = (error, collapseStacktrace = true) => {
         resultRows.push(indent(cursor.message, indentLevel));
         if (cursor.stack) {
             if (collapseStacktrace) {
-                resultRows.push(indent([...(0, exports.filterStacktrace)(cursor.stack)].join("\n"), indentLevel));
+                resultRows.push(indent([...(0, exports.filterStacktrace)(cursor.stack, extraFilter)].join("\n"), indentLevel));
             }
             else {
                 resultRows.push(indent(cursor.stack, indentLevel));
@@ -168,16 +179,19 @@ const getErrorFromTransformable = (info) => {
             return meta.error;
     }
 };
-const customFormat = (timestamp, collapseStacktrace) => winston_1.default.format.printf((info) => {
+const customFormat = (timestamp, collapseStacktrace, stacktraceFilter) => winston_1.default.format.printf((info) => {
     const effectiveTimestamp = timestamp === undefined
         ? logConfig.timestamp
         : timestamp;
     const effectiveCollapse = collapseStacktrace === undefined
         ? logConfig.collapseNodeModules || logConfig.collapseStacktrace
         : collapseStacktrace;
+    const effectiveStacktraceFilter = stacktraceFilter === undefined
+        ? logConfig.stacktraceFilter
+        : stacktraceFilter;
     const error = getErrorFromTransformable(info);
     const message = error
-        ? (0, exports.filterError)(error, effectiveCollapse)
+        ? (0, exports.filterError)(error, effectiveCollapse, effectiveStacktraceFilter)
         : info.message.toString();
     return (0, exports.prefixOutput)(info.level, message, effectiveTimestamp);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "3.10.1",
+  "version": "3.11.1",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",