specmatic 0.72.7 → 0.72.8

package/dist/common/logger.js

@@ -23,17 +23,31 @@ function getSpecmaticConfig() {
     try {
       packageJsonContent = _fs["default"].readFileSync(packageJsonPath);
     } catch (error) {
-      packageJsonContent = "{}";
+      packageJsonContent = '{}';
     }
     var packageConfig = JSON.parse(packageJsonContent);
     specmaticConfig = packageConfig.specmatic;
   }
   return specmaticConfig || {};
 }
+function getLogLevel() {
+  var logLevel;
+  if (process.env.SPECMATIC_LOG_LEVEL) {
+    logLevel = process.env.SPECMATIC_LOG_LEVEL;
+  }
+  if (!logLevel || !_winston.config.syslog.levels[logLevel]) {
+    var specmaticConfig = getSpecmaticConfig();
+    logLevel = specmaticConfig.logLevel;
+  }
+  if (!logLevel || !_winston.config.syslog.levels[logLevel]) {
+    logLevel = 'warn';
+  }
+  return logLevel;
+}
 function initLogger() {
-  var specmaticConfig = getSpecmaticConfig();
+  var logLevel = getLogLevel();
   var logger = (0, _winston.createLogger)({
-    level: specmaticConfig.logLevel || 'warn',
+    level: logLevel,
     format: _winston.format.combine(_winston.format.label({
       label: 'specmatic'
     }), _winston.format.timestamp({
@@ -45,4 +59,4 @@ function initLogger() {
 }
 var _default = initLogger();
 exports["default"] = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfd2luc3RvbiIsInJlcXVpcmUiLCJfZnMiLCJfaW50ZXJvcFJlcXVpcmVEZWZhdWx0Iiwib2JqIiwiX19lc01vZHVsZSIsImxvZ0Zvcm1hdCIsImZvcm1hdCIsInByaW50ZiIsIl9yZWYiLCJsZXZlbCIsIm1lc3NhZ2UiLCJsYWJlbCIsInRpbWVzdGFtcCIsImNvbmNhdCIsImdldFNwZWNtYXRpY0NvbmZpZyIsInBhY2thZ2VKc29uUGF0aCIsInNwZWNtYXRpY0NvbmZpZyIsImZzIiwiZXhpc3RzU3luYyIsInBhY2thZ2VKc29uQ29udGVudCIsInJlYWRGaWxlU3luYyIsImVycm9yIiwicGFja2FnZUNvbmZpZyIsIkpTT04iLCJwYXJzZSIsInNwZWNtYXRpYyIsImluaXRMb2dnZXIiLCJsb2dnZXIiLCJjcmVhdGVMb2dnZXIiLCJsb2dMZXZlbCIsImNvbWJpbmUiLCJ0cmFuc3BvcnRzIiwiQ29uc29sZSIsIl9kZWZhdWx0IiwiZXhwb3J0cyJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vbG9nZ2VyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNyZWF0ZUxvZ2dlciwgZm9ybWF0LCB0cmFuc3BvcnRzIH0gZnJvbSAnd2luc3Rvbic7XG5pbXBvcnQgZnMgZnJvbSAnZnMnO1xuXG5jb25zdCBsb2dGb3JtYXQgPSBmb3JtYXQucHJpbnRmKCh7IGxldmVsLCBtZXNzYWdlLCBsYWJlbCwgdGltZXN0YW1wIH0pID0+IHtcbiAgICByZXR1cm4gYFske2xhYmVsfV0gJHt0aW1lc3RhbXB9ICR7bGV2ZWx9OiAke21lc3NhZ2V9YDtcbn0pO1xuXG5mdW5jdGlvbiBnZXRTcGVjbWF0aWNDb25maWcoKSB7XG4gICAgY29uc3QgcGFja2FnZUpzb25QYXRoID0gJy4vcGFja2FnZS5qc29uJztcbiAgICB2YXIgc3BlY21hdGljQ29uZmlnO1xuICAgIGlmIChmcy5leGlzdHNTeW5jKHBhY2thZ2VKc29uUGF0aCkpIHtcbiAgICAgICAgbGV0IHBhY2thZ2VKc29uQ29udGVudDtcbiAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgIHBhY2thZ2VKc29uQ29udGVudCA9IGZzLnJlYWRGaWxlU3luYyhwYWNrYWdlSnNvblBhdGgpO1xuICAgICAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgICAgICAgcGFja2FnZUpzb25Db250ZW50ID0gXCJ7fVwiO1xuICAgICAgICB9XG4gICAgICAgIGNvbnN0IHBhY2thZ2VDb25maWcgPSBKU09OLnBhcnNlKHBhY2thZ2VKc29uQ29udGVudCBhcyB1bmtub3duIGFzIHN0cmluZyk7XG4gICAgICAgIHNwZWNtYXRpY0NvbmZpZyA9IHBhY2thZ2VDb25maWcuc3BlY21hdGljO1xuICAgIH1cbiAgICByZXR1cm4gc3BlY21hdGljQ29uZmlnIHx8IHt9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaW5pdExvZ2dlcigpIHtcbiAgICBjb25zdCBzcGVjbWF0aWNDb25maWcgPSBnZXRTcGVjbWF0aWNDb25maWcoKTtcbiAgICBjb25zdCBsb2dnZXIgPSBjcmVhdGVMb2dnZXIoe1xuICAgICAgICBsZXZlbDogc3BlY21hdGljQ29uZmlnLmxvZ0xldmVsIHx8ICd3YXJuJyxcbiAgICAgICAgZm9ybWF0OiBmb3JtYXQuY29tYmluZShmb3JtYXQubGFiZWwoeyBsYWJlbDogJ3NwZWNtYXRpYycgfSksIGZvcm1hdC50aW1lc3RhbXAoeyBmb3JtYXQ6ICdERC1NTS1ZWVlZIEhIOm1tOnNzJyB9KSwgbG9nRm9ybWF0KSxcbiAgICAgICAgdHJhbnNwb3J0czogW25ldyB0cmFuc3BvcnRzLkNvbnNvbGUoKV0sXG4gICAgfSk7XG4gICAgcmV0dXJuIGxvZ2dlcjtcbn1cblxuZXhwb3J0IGRlZmF1bHQgaW5pdExvZ2dlcigpO1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBQUEsUUFBQSxHQUFBQyxPQUFBO0FBQ0EsSUFBQUMsR0FBQSxHQUFBQyxzQkFBQSxDQUFBRixPQUFBO0FBQW9CLFNBQUFFLHVCQUFBQyxHQUFBLFdBQUFBLEdBQUEsSUFBQUEsR0FBQSxDQUFBQyxVQUFBLEdBQUFELEdBQUEsZ0JBQUFBLEdBQUE7QUFFcEIsSUFBTUUsU0FBUyxHQUFHQyxlQUFNLENBQUNDLE1BQU0sQ0FBQyxVQUFBQyxJQUFBLEVBQTBDO0VBQUEsSUFBdkNDLEtBQUssR0FBQUQsSUFBQSxDQUFMQyxLQUFLO0lBQUVDLE9BQU8sR0FBQUYsSUFBQSxDQUFQRSxPQUFPO0lBQUVDLEtBQUssR0FBQUgsSUFBQSxDQUFMRyxLQUFLO0lBQUVDLFNBQVMsR0FBQUosSUFBQSxDQUFUSSxTQUFTO0VBQy9ELFdBQUFDLE1BQUEsQ0FBV0YsS0FBSyxRQUFBRSxNQUFBLENBQUtELFNBQVMsT0FBQUMsTUFBQSxDQUFJSixLQUFLLFFBQUFJLE1BQUEsQ0FBS0gsT0FBTztBQUN2RCxDQUFDLENBQUM7QUFFRixTQUFTSSxrQkFBa0JBLENBQUEsRUFBRztFQUMxQixJQUFNQyxlQUFlLEdBQUcsZ0JBQWdCO0VBQ3hDLElBQUlDLGVBQWU7RUFDbkIsSUFBSUMsY0FBRSxDQUFDQyxVQUFVLENBQUNILGVBQWUsQ0FBQyxFQUFFO0lBQ2hDLElBQUlJLGtCQUFrQjtJQUN0QixJQUFJO01BQ0FBLGtCQUFrQixHQUFHRixjQUFFLENBQUNHLFlBQVksQ0FBQ0wsZUFBZSxDQUFDO0lBQ3pELENBQUMsQ0FBQyxPQUFPTSxLQUFLLEVBQUU7TUFDWkYsa0JBQWtCLEdBQUcsSUFBSTtJQUM3QjtJQUNBLElBQU1HLGFBQWEsR0FBR0MsSUFBSSxDQUFDQyxLQUFLLENBQUNMLGtCQUF1QyxDQUFDO0lBQ3pFSCxlQUFlLEdBQUdNLGFBQWEsQ0FBQ0csU0FBUztFQUM3QztFQUNBLE9BQU9ULGVBQWUsSUFBSSxDQUFDLENBQUM7QUFDaEM7QUFFTyxTQUFTVSxVQUFVQSxDQUFBLEVBQUc7RUFDekIsSUFBTVYsZUFBZSxHQUFHRixrQkFBa0IsQ0FBQyxDQUFDO0VBQzVDLElBQU1hLE1BQU0sR0FBRyxJQUFBQyxxQkFBWSxFQUFDO0lBQ3hCbkIsS0FBSyxFQUFFTyxlQUFlLENBQUNhLFFBQVEsSUFBSSxNQUFNO0lBQ3pDdkIsTUFBTSxFQUFFQSxlQUFNLENBQUN3QixPQUFPLENBQUN4QixlQUFNLENBQUNLLEtBQUssQ0FBQztNQUFFQSxLQUFLLEVBQUU7SUFBWSxDQUFDLENBQUMsRUFBRUwsZUFBTSxDQUFDTSxTQUFTLENBQUM7TUFBRU4sTUFBTSxFQUFFO0lBQXNCLENBQUMsQ0FBQyxFQUFFRCxTQUFTLENBQUM7SUFDNUgwQixVQUFVLEVBQUUsQ0FBQyxJQUFJQSxtQkFBVSxDQUFDQyxPQUFPLENBQUMsQ0FBQztFQUN6QyxDQUFDLENBQUM7RUFDRixPQUFPTCxNQUFNO0FBQ2pCO0FBQUMsSUFBQU0sUUFBQSxHQUVjUCxVQUFVLENBQUMsQ0FBQztBQUFBUSxPQUFBLGNBQUFELFFBQUEifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfd2luc3RvbiIsInJlcXVpcmUiLCJfZnMiLCJfaW50ZXJvcFJlcXVpcmVEZWZhdWx0Iiwib2JqIiwiX19lc01vZHVsZSIsImxvZ0Zvcm1hdCIsImZvcm1hdCIsInByaW50ZiIsIl9yZWYiLCJsZXZlbCIsIm1lc3NhZ2UiLCJsYWJlbCIsInRpbWVzdGFtcCIsImNvbmNhdCIsImdldFNwZWNtYXRpY0NvbmZpZyIsInBhY2thZ2VKc29uUGF0aCIsInNwZWNtYXRpY0NvbmZpZyIsImZzIiwiZXhpc3RzU3luYyIsInBhY2thZ2VKc29uQ29udGVudCIsInJlYWRGaWxlU3luYyIsImVycm9yIiwicGFja2FnZUNvbmZpZyIsIkpTT04iLCJwYXJzZSIsInNwZWNtYXRpYyIsImdldExvZ0xldmVsIiwibG9nTGV2ZWwiLCJwcm9jZXNzIiwiZW52IiwiU1BFQ01BVElDX0xPR19MRVZFTCIsImNvbmZpZyIsInN5c2xvZyIsImxldmVscyIsImluaXRMb2dnZXIiLCJsb2dnZXIiLCJjcmVhdGVMb2dnZXIiLCJjb21iaW5lIiwidHJhbnNwb3J0cyIsIkNvbnNvbGUiLCJfZGVmYXVsdCIsImV4cG9ydHMiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbW9uL2xvZ2dlci50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb25maWcsIGNyZWF0ZUxvZ2dlciwgZm9ybWF0LCB0cmFuc3BvcnRzIH0gZnJvbSAnd2luc3RvbidcbmltcG9ydCBmcyBmcm9tICdmcydcblxuY29uc3QgbG9nRm9ybWF0ID0gZm9ybWF0LnByaW50ZigoeyBsZXZlbCwgbWVzc2FnZSwgbGFiZWwsIHRpbWVzdGFtcCB9KSA9PiB7XG4gICAgcmV0dXJuIGBbJHtsYWJlbH1dICR7dGltZXN0YW1wfSAke2xldmVsfTogJHttZXNzYWdlfWBcbn0pXG5cbmZ1bmN0aW9uIGdldFNwZWNtYXRpY0NvbmZpZygpIHtcbiAgICBjb25zdCBwYWNrYWdlSnNvblBhdGggPSAnLi9wYWNrYWdlLmpzb24nXG4gICAgdmFyIHNwZWNtYXRpY0NvbmZpZ1xuICAgIGlmIChmcy5leGlzdHNTeW5jKHBhY2thZ2VKc29uUGF0aCkpIHtcbiAgICAgICAgbGV0IHBhY2thZ2VKc29uQ29udGVudFxuICAgICAgICB0cnkge1xuICAgICAgICAgICAgcGFja2FnZUpzb25Db250ZW50ID0gZnMucmVhZEZpbGVTeW5jKHBhY2thZ2VKc29uUGF0aClcbiAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICAgICAgICAgIHBhY2thZ2VKc29uQ29udGVudCA9ICd7fSdcbiAgICAgICAgfVxuICAgICAgICBjb25zdCBwYWNrYWdlQ29uZmlnID0gSlNPTi5wYXJzZShwYWNrYWdlSnNvbkNvbnRlbnQgYXMgdW5rbm93biBhcyBzdHJpbmcpXG4gICAgICAgIHNwZWNtYXRpY0NvbmZpZyA9IHBhY2thZ2VDb25maWcuc3BlY21hdGljXG4gICAgfVxuICAgIHJldHVybiBzcGVjbWF0aWNDb25maWcgfHwge31cbn1cblxuZnVuY3Rpb24gZ2V0TG9nTGV2ZWwoKSB7XG4gICAgbGV0IGxvZ0xldmVsXG4gICAgaWYgKHByb2Nlc3MuZW52LlNQRUNNQVRJQ19MT0dfTEVWRUwpIHtcbiAgICAgICAgbG9nTGV2ZWwgPSBwcm9jZXNzLmVudi5TUEVDTUFUSUNfTE9HX0xFVkVMXG4gICAgfVxuICAgIGlmICghbG9nTGV2ZWwgfHwgIWNvbmZpZy5zeXNsb2cubGV2ZWxzW2xvZ0xldmVsXSkge1xuICAgICAgICBjb25zdCBzcGVjbWF0aWNDb25maWcgPSBnZXRTcGVjbWF0aWNDb25maWcoKVxuICAgICAgICBsb2dMZXZlbCA9IHNwZWNtYXRpY0NvbmZpZy5sb2dMZXZlbFxuICAgIH1cbiAgICBpZiAoIWxvZ0xldmVsIHx8ICFjb25maWcuc3lzbG9nLmxldmVsc1tsb2dMZXZlbF0pIHtcbiAgICAgICAgbG9nTGV2ZWwgPSAnd2FybidcbiAgICB9XG4gICAgcmV0dXJuIGxvZ0xldmVsXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBpbml0TG9nZ2VyKCkge1xuICAgIGxldCBsb2dMZXZlbCA9IGdldExvZ0xldmVsKClcbiAgICBjb25zdCBsb2dnZXIgPSBjcmVhdGVMb2dnZXIoe1xuICAgICAgICBsZXZlbDogbG9nTGV2ZWwsXG4gICAgICAgIGZvcm1hdDogZm9ybWF0LmNvbWJpbmUoZm9ybWF0LmxhYmVsKHsgbGFiZWw6ICdzcGVjbWF0aWMnIH0pLCBmb3JtYXQudGltZXN0YW1wKHsgZm9ybWF0OiAnREQtTU0tWVlZWSBISDptbTpzcycgfSksIGxvZ0Zvcm1hdCksXG4gICAgICAgIHRyYW5zcG9ydHM6IFtuZXcgdHJhbnNwb3J0cy5Db25zb2xlKCldLFxuICAgIH0pXG4gICAgcmV0dXJuIGxvZ2dlclxufVxuXG5leHBvcnQgZGVmYXVsdCBpbml0TG9nZ2VyKClcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLElBQUFBLFFBQUEsR0FBQUMsT0FBQTtBQUNBLElBQUFDLEdBQUEsR0FBQUMsc0JBQUEsQ0FBQUYsT0FBQTtBQUFtQixTQUFBRSx1QkFBQUMsR0FBQSxXQUFBQSxHQUFBLElBQUFBLEdBQUEsQ0FBQUMsVUFBQSxHQUFBRCxHQUFBLGdCQUFBQSxHQUFBO0FBRW5CLElBQU1FLFNBQVMsR0FBR0MsZUFBTSxDQUFDQyxNQUFNLENBQUMsVUFBQUMsSUFBQSxFQUEwQztFQUFBLElBQXZDQyxLQUFLLEdBQUFELElBQUEsQ0FBTEMsS0FBSztJQUFFQyxPQUFPLEdBQUFGLElBQUEsQ0FBUEUsT0FBTztJQUFFQyxLQUFLLEdBQUFILElBQUEsQ0FBTEcsS0FBSztJQUFFQyxTQUFTLEdBQUFKLElBQUEsQ0FBVEksU0FBUztFQUMvRCxXQUFBQyxNQUFBLENBQVdGLEtBQUssUUFBQUUsTUFBQSxDQUFLRCxTQUFTLE9BQUFDLE1BQUEsQ0FBSUosS0FBSyxRQUFBSSxNQUFBLENBQUtILE9BQU87QUFDdkQsQ0FBQyxDQUFDO0FBRUYsU0FBU0ksa0JBQWtCQSxDQUFBLEVBQUc7RUFDMUIsSUFBTUMsZUFBZSxHQUFHLGdCQUFnQjtFQUN4QyxJQUFJQyxlQUFlO0VBQ25CLElBQUlDLGNBQUUsQ0FBQ0MsVUFBVSxDQUFDSCxlQUFlLENBQUMsRUFBRTtJQUNoQyxJQUFJSSxrQkFBa0I7SUFDdEIsSUFBSTtNQUNBQSxrQkFBa0IsR0FBR0YsY0FBRSxDQUFDRyxZQUFZLENBQUNMLGVBQWUsQ0FBQztJQUN6RCxDQUFDLENBQUMsT0FBT00sS0FBSyxFQUFFO01BQ1pGLGtCQUFrQixHQUFHLElBQUk7SUFDN0I7SUFDQSxJQUFNRyxhQUFhLEdBQUdDLElBQUksQ0FBQ0MsS0FBSyxDQUFDTCxrQkFBdUMsQ0FBQztJQUN6RUgsZUFBZSxHQUFHTSxhQUFhLENBQUNHLFNBQVM7RUFDN0M7RUFDQSxPQUFPVCxlQUFlLElBQUksQ0FBQyxDQUFDO0FBQ2hDO0FBRUEsU0FBU1UsV0FBV0EsQ0FBQSxFQUFHO0VBQ25CLElBQUlDLFFBQVE7RUFDWixJQUFJQyxPQUFPLENBQUNDLEdBQUcsQ0FBQ0MsbUJBQW1CLEVBQUU7SUFDakNILFFBQVEsR0FBR0MsT0FBTyxDQUFDQyxHQUFHLENBQUNDLG1CQUFtQjtFQUM5QztFQUNBLElBQUksQ0FBQ0gsUUFBUSxJQUFJLENBQUNJLGVBQU0sQ0FBQ0MsTUFBTSxDQUFDQyxNQUFNLENBQUNOLFFBQVEsQ0FBQyxFQUFFO0lBQzlDLElBQU1YLGVBQWUsR0FBR0Ysa0JBQWtCLENBQUMsQ0FBQztJQUM1Q2EsUUFBUSxHQUFHWCxlQUFlLENBQUNXLFFBQVE7RUFDdkM7RUFDQSxJQUFJLENBQUNBLFFBQVEsSUFBSSxDQUFDSSxlQUFNLENBQUNDLE1BQU0sQ0FBQ0MsTUFBTSxDQUFDTixRQUFRLENBQUMsRUFBRTtJQUM5Q0EsUUFBUSxHQUFHLE1BQU07RUFDckI7RUFDQSxPQUFPQSxRQUFRO0FBQ25CO0FBRU8sU0FBU08sVUFBVUEsQ0FBQSxFQUFHO0VBQ3pCLElBQUlQLFFBQVEsR0FBR0QsV0FBVyxDQUFDLENBQUM7RUFDNUIsSUFBTVMsTUFBTSxHQUFHLElBQUFDLHFCQUFZLEVBQUM7SUFDeEIzQixLQUFLLEVBQUVrQixRQUFRO0lBQ2ZyQixNQUFNLEVBQUVBLGVBQU0sQ0FBQytCLE9BQU8sQ0FBQy9CLGVBQU0sQ0FBQ0ssS0FBSyxDQUFDO01BQUVBLEtBQUssRUFBRTtJQUFZLENBQUMsQ0FBQyxFQUFFTCxlQUFNLENBQUNNLFNBQVMsQ0FBQztNQUFFTixNQUFNLEVBQUU7SUFBc0IsQ0FBQyxDQUFDLEVBQUVELFNBQVMsQ0FBQztJQUM1SGlDLFVBQVUsRUFBRSxDQUFDLElBQUlBLG1CQUFVLENBQUNDLE9BQU8sQ0FBQyxDQUFDO0VBQ3pDLENBQUMsQ0FBQztFQUNGLE9BQU9KLE1BQU07QUFDakI7QUFBQyxJQUFBSyxRQUFBLEdBRWNOLFVBQVUsQ0FBQyxDQUFDO0FBQUFPLE9BQUEsY0FBQUQsUUFBQSJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specmatic",
-  "version": "0.72.7",
+  "version": "0.72.8",
   "description": "Node wrapper for Specmatic",
   "main": "dist/index.js",
   "scripts": {
@@ -57,6 +57,7 @@
     "jest": "^29.6.1",
     "jest-extended": "^4.0.0",
     "jest-mock-extended": "^3.0.4",
+    "jest-when": "^3.5.2",
     "rimraf": "^5.0.1",
     "supertest": "^6.3.3",
     "typescript": "^5.1.6"

package/src/common/__tests__/logger.ts

@@ -1,64 +1,85 @@
-import { initLogger } from '../logger';
+import { initLogger } from '../logger'
+import { when } from 'jest-when'
 
-import fs from 'fs';
+import fs from 'fs'
 
 beforeEach(() => {
-    jest.resetAllMocks();
-});
+    jest.resetAllMocks()
+    delete process.env.SPECMATIC_LOG_LEVEL
+})
 
 test('logging level is debug as configured in package.json', () => {
-    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync').mockReturnValue(
-        '{\
-            "specmatic": {\
-                "logLevel": "debug"\
-            }\
-        }'
-    );
-    const logger = initLogger();
-    expect(packageJsonFileReadSpy).toHaveBeenCalledTimes(1);
-    expect(logger.level).toBe('debug');
-});
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {"logLevel": "debug"}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('debug')
+})
 
 test('logging level is info as configured in package.json', () => {
-    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync').mockReturnValue(
-        '{\
-            "specmatic": {\
-                "logLevel": "info"\
-            }\
-        }'
-    );
-    const logger = initLogger();
-    expect(packageJsonFileReadSpy).toHaveBeenCalledTimes(1);
-    expect(logger.level).toBe('info');
-});
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {"logLevel": "info"}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('info')
+})
 
 test('defaults logging level to warn when logLevel setting does not exist with specmatic configuration', () => {
-    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync').mockReturnValue(
-        '{\
-            "specmatic": {\
-            }\
-        }'
-    );
-    const logger = initLogger();
-    expect(packageJsonFileReadSpy).toHaveBeenCalledTimes(1);
-    expect(logger.level).toBe('warn');
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('warn')
 })
 
 test('defaults logging level to warn when specmatic configuration does not exist', () => {
-    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync').mockReturnValue(
-        '{\
-        }'
-    );
-    const logger = initLogger();
-    expect(packageJsonFileReadSpy).toHaveBeenCalledTimes(1);
-    expect(logger.level).toBe('warn');
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{}')
+    const logger = initLogger()
+    expect(logger.level).toBe('warn')
 })
 
 test('defaults logging level to warn when package.json does not exist', () => {
-    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync').mockImplementation(() => {
-        throw new Error();
-    });
-    const logger = initLogger();
-    expect(packageJsonFileReadSpy).toHaveBeenCalledTimes(1);
-    expect(logger.level).toBe('warn');
-});
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy)
+        .calledWith('./package.json')
+        .mockImplementation(() => {
+            throw new Error()
+        })
+    const logger = initLogger()
+    expect(logger.level).toBe('warn')
+})
+
+test('log level is read from environment variable', () => {
+    process.env.SPECMATIC_LOG_LEVEL = 'debug'
+    const logger = initLogger()
+    expect(logger.level).toBe('debug')
+})
+
+test('log level set in environment variable takes precendece over specmatic.json', () => {
+    process.env.SPECMATIC_LOG_LEVEL = 'error'
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {"logLevel": "debug"}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('error')
+})
+
+test('log level set in environment variable is used instead of default', () => {
+    process.env.SPECMATIC_LOG_LEVEL = 'error'
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{}')
+    const logger = initLogger()
+    expect(logger.level).toBe('error')
+})
+
+test('uses default log level "warn" when log level configured in specmatic.json is invalid', () => {
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {"logLevel": "silly"}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('warn')
+})
+
+test('ignores log level configured in environment variable when invalid', () => {
+    process.env.SPECMATIC_LOG_LEVEL = 'silly'
+    const packageJsonFileReadSpy = jest.spyOn(fs, 'readFileSync')
+    when(packageJsonFileReadSpy).calledWith('./package.json').mockReturnValue('{"specmatic": {"logLevel": "debug"}}')
+    const logger = initLogger()
+    expect(logger.level).toBe('debug')
+})

package/src/common/logger.ts

@@ -1,34 +1,49 @@
-import { createLogger, format, transports } from 'winston';
-import fs from 'fs';
+import { config, createLogger, format, transports } from 'winston'
+import fs from 'fs'
 
 const logFormat = format.printf(({ level, message, label, timestamp }) => {
-    return `[${label}] ${timestamp} ${level}: ${message}`;
-});
+    return `[${label}] ${timestamp} ${level}: ${message}`
+})
 
 function getSpecmaticConfig() {
-    const packageJsonPath = './package.json';
-    var specmaticConfig;
+    const packageJsonPath = './package.json'
+    var specmaticConfig
     if (fs.existsSync(packageJsonPath)) {
-        let packageJsonContent;
+        let packageJsonContent
         try {
-            packageJsonContent = fs.readFileSync(packageJsonPath);
+            packageJsonContent = fs.readFileSync(packageJsonPath)
         } catch (error) {
-            packageJsonContent = "{}";
+            packageJsonContent = '{}'
         }
-        const packageConfig = JSON.parse(packageJsonContent as unknown as string);
-        specmaticConfig = packageConfig.specmatic;
+        const packageConfig = JSON.parse(packageJsonContent as unknown as string)
+        specmaticConfig = packageConfig.specmatic
     }
-    return specmaticConfig || {};
+    return specmaticConfig || {}
+}
+
+function getLogLevel() {
+    let logLevel
+    if (process.env.SPECMATIC_LOG_LEVEL) {
+        logLevel = process.env.SPECMATIC_LOG_LEVEL
+    }
+    if (!logLevel || !config.syslog.levels[logLevel]) {
+        const specmaticConfig = getSpecmaticConfig()
+        logLevel = specmaticConfig.logLevel
+    }
+    if (!logLevel || !config.syslog.levels[logLevel]) {
+        logLevel = 'warn'
+    }
+    return logLevel
 }
 
 export function initLogger() {
-    const specmaticConfig = getSpecmaticConfig();
+    let logLevel = getLogLevel()
     const logger = createLogger({
-        level: specmaticConfig.logLevel || 'warn',
+        level: logLevel,
         format: format.combine(format.label({ label: 'specmatic' }), format.timestamp({ format: 'DD-MM-YYYY HH:mm:ss' }), logFormat),
         transports: [new transports.Console()],
-    });
-    return logger;
+    })
+    return logger
 }
 
-export default initLogger();
+export default initLogger()