@things-factory/env 7.0.0-alpha.30 → 7.0.0

package/index.js

@@ -5,5 +5,6 @@ module.exports = {
   config: require('./lib/config'),
   logger: require('./lib/logger'),
   loader: require('./lib/module-loader'),
-  appRootPath: require('./lib/app-root-path').appRootPath
+  appRootPath: require('./lib/app-root-path').appRootPath,
+  appPackage: require('./lib/app-package')
 }

package/lib/app-package.js

@@ -0,0 +1,4 @@
+const path = require('path')
+const { appRootPath } = require('./app-root-path')
+
+module.exports = require(path.resolve(appRootPath, 'package.json'))

package/lib/logger.js

@@ -4,7 +4,7 @@ var config = require('./config')
 var { createLogger, format, transports } = require('winston')
 require('winston-daily-rotate-file')
 
-const { combine, timestamp, splat, simple, printf } = format
+const { combine, errors, splat, printf } = format
 
 var { file: fileConfig, console: consoleConfig } = config.get('logger', {})
 
@@ -35,11 +35,11 @@ const systemTimestamp = format((info, opts) => {
   return info
 })
 
-const logFormat = printf(({ level, message, timestamp }) => {
-  return `${timestamp} ${level}: ${message}`
+const logFormat = printf(({ level, message, timestamp, stack }) => {
+  return `${timestamp} ${level}: ${stack || message}`
 })
 
 module.exports = createLogger({
-  format: combine(systemTimestamp({ tz: SYSTEM_TZ }), splat(), logFormat),
+  format: combine(errors({ stack: true }), systemTimestamp({ tz: SYSTEM_TZ }), splat(), logFormat),
   transports: logTransports
 })

package/lib/operato-modules.js

@@ -0,0 +1,36 @@
+const path = require('path')
+const { appRootPath } = require('./app-root-path')
+const orderedModuleNames = require('./dependency-order')
+
+const selfModulePackage = require(path.resolve(appRootPath, 'package.json'))
+const selfModuleName = selfModulePackage.name
+
+const operatoModues = orderedModuleNames.reduce((sum, name) => {
+  const dependencies =
+    name === selfModuleName ? selfModulePackage['dependencies'] : require(`${name}/package.json`)['dependencies'] || {}
+
+  Object.keys(dependencies)
+    .filter(dep => {
+      try {
+        const pkg = require(`${dep}/package.json`)
+        return pkg && pkg['operato']
+      } catch (err) {
+        return
+      }
+    })
+    .forEach(dep => {
+      sum[dep] = true
+    })
+
+  return sum
+}, {})
+
+const operatoModuleNames = Object.keys(operatoModues)
+
+if (selfModulePackage['operato'] && !operatoModuleNames.includes(selfModuleName)) {
+  operatoModuleNames.push(selfModuleName)
+}
+
+console.log('operato module names', operatoModuleNames)
+
+module.exports = operatoModuleNames

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/env",
-  "version": "7.0.0-alpha.30",
+  "version": "7.0.0",
   "description": "Things Factory running environment helper library",
   "main": "index.js",
   "author": "heartyoh@hatiolab.com",
@@ -27,5 +27,5 @@
     "winston": "^3.2.1",
     "winston-daily-rotate-file": "^4.2.1"
   },
-  "gitHead": "64f2ff6e284ecb26530d1a456a0627dced03fde7"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }