@platformatic/service 0.35.5 → 0.36.0

package/index.js

@@ -16,7 +16,6 @@ const loadPlugins = require('./lib/plugins/plugins')
 const { telemetry } = require('@platformatic/telemetry')
 
 const { schema } = require('./lib/schema')
-const { loadConfig } = require('./lib/load-config')
 const { addLoggerToTheConfig } = require('./lib/utils')
 const { start, buildServer } = require('./lib/start')
 
@@ -130,7 +129,6 @@ function _buildServer (options, app) {
 module.exports.buildServer = _buildServer
 module.exports.schema = require('./lib/schema')
 module.exports.platformaticService = platformaticService
-module.exports.loadConfig = loadConfig
 module.exports.addLoggerToTheConfig = addLoggerToTheConfig
 module.exports.tsCompiler = compiler
 module.exports.start = start

package/lib/compile.js

@@ -3,7 +3,7 @@
 const { resolve, join, dirname } = require('path')
 const pino = require('pino')
 const pretty = require('pino-pretty')
-const { loadConfig } = require('./load-config.js')
+const { loadConfig } = require('@platformatic/config')
 const { isFileAccessible } = require('./utils.js')
 
 async function getTSCExecutablePath (cwd) {

package/lib/start.js

@@ -2,9 +2,8 @@
 
 const { readFile } = require('fs/promises')
 const close = require('close-with-grace')
-const { loadConfig } = require('./load-config')
+const { loadConfig, ConfigManager, printConfigValidationErrors, printAndExitLoadConfigError } = require('@platformatic/config')
 const { addLoggerToTheConfig } = require('./utils.js')
-const ConfigManager = require('@platformatic/config')
 const { restartable } = require('@fastify/restartable')
 
 async function adjustHttpsKeyAndCert (arg) {
@@ -98,7 +97,17 @@ async function safeRestart (app) {
 
 async function start (appType, _args) {
   /* c8 ignore next 55 */
-  const { configManager } = await loadConfig({}, _args, appType)
+  let configManager = null
+  try {
+    configManager = (await loadConfig({}, _args, appType)).configManager
+  } catch (err) {
+    if (err.validationErrors) {
+      printConfigValidationErrors(err)
+      process.exit(1)
+    } else {
+      throw err
+    }
+  }
 
   const config = configManager.current
 
@@ -118,9 +127,7 @@ async function start (appType, _args) {
     app = await buildServer({ ...config, configManager }, appType)
     await app.start()
   } catch (err) {
-    // TODO route this to a logger
-    console.error(err)
-    process.exit(1)
+    printAndExitLoadConfigError(err)
   }
 
   // Ignore from CI because SIGUSR2 is not available
@@ -144,6 +151,8 @@ async function start (appType, _args) {
       app.log.info({ signal }, 'received signal')
     }
 
+    // Weird coverage issue in c8
+    /* c8 ignore next 2 */
     await app.close()
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.35.5",
+  "version": "0.36.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -65,12 +65,12 @@
     "pino-pretty": "^10.0.0",
     "rfdc": "^1.3.0",
     "ua-parser-js": "^1.0.35",
-    "@platformatic/client": "0.35.5",
-    "@platformatic/config": "0.35.5",
-    "@platformatic/swagger-ui-theme": "0.35.5",
-    "@platformatic/types": "0.35.5",
-    "@platformatic/utils": "0.35.5",
-    "@platformatic/telemetry": "0.35.5"
+    "@platformatic/client": "0.36.0",
+    "@platformatic/config": "0.36.0",
+    "@platformatic/swagger-ui-theme": "0.36.0",
+    "@platformatic/types": "0.36.0",
+    "@platformatic/utils": "0.36.0",
+    "@platformatic/telemetry": "0.36.0"
   },
   "standard": {
     "ignore": [

package/lib/load-config.js

@@ -1,79 +0,0 @@
-'use strict'
-
-const parseArgs = require('minimist')
-const { access } = require('fs/promises')
-const ConfigManager = require('@platformatic/config')
-const deepmerge = require('@fastify/deepmerge')
-
-// Unfortunately c8 does not see those on Windows
-/* c8 ignore next 70 */
-async function loadConfig (minimistConfig, _args, app, overrides = {}) {
-  const configManagerConfig = {
-    ...app.configManagerConfig,
-    ...overrides
-  }
-
-  const configType = app.configType
-
-  const args = parseArgs(_args, deepmerge({ all: true })({
-    string: ['allow-env'],
-    default: {
-      allowEnv: '' // The default is set in ConfigManager
-    },
-    alias: {
-      v: 'version',
-      c: 'config',
-      allowEnv: ['allow-env', 'E']
-    }
-  }, minimistConfig))
-
-  try {
-    if (!args.config) {
-      args.config = await ConfigManager.findConfigFile(process.cwd(), configType)
-    }
-    await access(args.config)
-  } catch (err) {
-    const configFiles = ConfigManager.listConfigFiles(configType)
-    console.error(`
-Missing config file!
-Be sure to have a config file with one of the following names:
-
-${configFiles.map((s) => ' * ' + s).join('\n')}
-
-In alternative run "npm create platformatic@latest" to generate a basic plt service config.
-Error: ${err}
-`)
-    process.exit(1)
-  }
-
-  const envWhitelist = args.allowEnv ? args.allowEnv : configManagerConfig.envWhitelist
-  const configManager = new ConfigManager({
-    source: args.config,
-    ...configManagerConfig,
-    envWhitelist
-  })
-
-  try {
-    const parsingResult = await configManager.parse()
-    if (!parsingResult) {
-      printConfigValidationErrors(configManager)
-      process.exit(1)
-    }
-  } finally {
-    configManager.stopWatching()
-  }
-
-  return { configManager, args }
-}
-
-function printConfigValidationErrors (configManager) {
-  const tabularData = configManager.validationErrors.map((err) => {
-    return {
-      path: err.path,
-      message: err.message
-    }
-  })
-  console.table(tabularData, ['path', 'message'])
-}
-
-module.exports.loadConfig = loadConfig