@platformatic/service 2.0.0-alpha.14 → 2.0.0-alpha.16

package/config.d.ts

@@ -31,7 +31,13 @@ export interface PlatformaticService {
     logger?:
       | boolean
       | {
-          level?: string;
+          level: (
+            | ("fatal" | "error" | "warn" | "info" | "debug" | "trace" | "silent")
+            | {
+                [k: string]: unknown;
+              }
+          ) &
+            string;
           transport?:
             | {
                 target?: string;

package/index.js

@@ -104,7 +104,7 @@ module.exports.configManagerConfig = {
     useDefaults: true,
     coerceTypes: true,
     allErrors: true,
-    strict: false,
+    strict: false
   },
   async transformConfig () {
     // Set watch to true by default. This is not possible
@@ -134,7 +134,7 @@ module.exports.configManagerConfig = {
       this.current.watch.ignore.push(outDir + '/**/*')
     }
   },
-  upgrade,
+  upgrade
 }
 
 platformaticService.configType = 'service'
@@ -145,23 +145,26 @@ function _buildServer (options, app) {
   return buildServer(options, app || module.exports)
 }
 
-async function buildStackable (
-  options,
-  app = platformaticService,
-  Stackable = ServiceStackable
-) {
+async function buildStackable (options, app = platformaticService, Stackable = ServiceStackable) {
   let configManager = options.configManager
 
   if (configManager === undefined) {
     if (typeof options.config === 'string') {
-      ({ configManager } = await loadConfig({}, ['-c', options.config], app, {
-        onMissingEnv: options.onMissingEnv,
-        context: options.context,
-      }, true))
+      ;({ configManager } = await loadConfig(
+        {},
+        ['-c', options.config],
+        app,
+        {
+          onMissingEnv: options.onMissingEnv,
+          context: options.context
+        },
+        true
+      ))
     } else {
       configManager = new ConfigManager({
         ...app.configManagerConfig,
         source: options.config,
+        dirname: options.context?.directory
       })
       await configManager.parseAndValidate()
     }
@@ -171,7 +174,7 @@ async function buildStackable (
     init: () => buildServer(configManager.current, app, options.context),
     stackable: app,
     configManager,
-    context: options.context,
+    context: options.context
   })
 
   return stackable

package/lib/schema.js

@@ -5,7 +5,7 @@
 const pkg = require('../package.json')
 const openApiDefs = require('./openapi-schema-defs')
 const telemetry = require('@platformatic/telemetry').schema
-const { server, cors, watch } = require('@platformatic/utils').schemaComponents
+const { fastifyServer: server, cors, watch } = require('@platformatic/utils').schemaComponents
 
 const plugins = {
   type: 'object',

package/lib/stackable.js

@@ -6,6 +6,7 @@ const pino = require('pino')
 const httpMetrics = require('@platformatic/fastify-http-metrics')
 const { extractTypeScriptCompileOptionsFromConfig } = require('./compile')
 const { compile } = require('@platformatic/ts-compiler')
+const { deepmerge } = require('@platformatic/utils')
 
 class ServiceStackable {
   constructor (options) {
@@ -64,9 +65,9 @@ class ServiceStackable {
     const compileOptions = {
       ...typeScriptCompileOptions,
       cwd,
-      logger: this.configManager.current.server.logger,
+      logger: this.logger
     }
-    if (!await compile(compileOptions)) {
+    if (!(await compile(compileOptions))) {
       throw new Error(`Failed to compile ${cwd}`)
     }
   }
@@ -99,6 +100,10 @@ class ServiceStackable {
     return config
   }
 
+  async getEnv () {
+    return this.configManager.env
+  }
+
   async getWatchConfig () {
     const config = this.configManager.current
 
@@ -210,7 +215,7 @@ class ServiceStackable {
       config.metrics = metricsConfig
     }
     if (serverConfig) {
-      config.server = serverConfig
+      config.server = deepmerge(config.server ?? {}, serverConfig ?? {})
     }
 
     if ((hasManagementApi && config.metrics === undefined) || config.metrics) {
@@ -239,20 +244,27 @@ class ServiceStackable {
   }
 
   #initLogger () {
-    this.configManager.current.server = this.configManager.current.server || {}
-    const level = this.configManager.current.server.logger?.level
+    if (this.configManager.current.server?.loggerInstance) {
+      this.logger = this.configManager.current.server?.loggerInstance
+      return
+    }
+
+    this.configManager.current.server ??= {}
+    this.loggerConfig = deepmerge(this.context.loggerConfig ?? {}, this.configManager.current.server?.logger ?? {})
 
     const pinoOptions = {
-      level: level ?? 'trace'
+      level: this.loggerConfig?.level ?? 'trace'
     }
 
     if (this.context?.serviceId) {
       pinoOptions.name = this.context.serviceId
     }
 
+    this.logger = pino(pinoOptions)
+
     // Only one of logger and loggerInstance should be set
     delete this.configManager.current.server.logger
-    this.configManager.current.server.loggerInstance = pino(pinoOptions)
+    this.configManager.current.server.loggerInstance = this.logger
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "2.0.0-alpha.14",
+  "version": "2.0.0-alpha.16",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -75,13 +75,13 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^6.9.0",
-    "@platformatic/client": "2.0.0-alpha.14",
-    "@platformatic/config": "2.0.0-alpha.14",
-    "@platformatic/generators": "2.0.0-alpha.14",
-    "@platformatic/scalar-theme": "2.0.0-alpha.14",
-    "@platformatic/telemetry": "2.0.0-alpha.14",
-    "@platformatic/utils": "2.0.0-alpha.14",
-    "@platformatic/ts-compiler": "2.0.0-alpha.14"
+    "@platformatic/client": "2.0.0-alpha.16",
+    "@platformatic/config": "2.0.0-alpha.16",
+    "@platformatic/generators": "2.0.0-alpha.16",
+    "@platformatic/scalar-theme": "2.0.0-alpha.16",
+    "@platformatic/telemetry": "2.0.0-alpha.16",
+    "@platformatic/ts-compiler": "2.0.0-alpha.16",
+    "@platformatic/utils": "2.0.0-alpha.16"
   },
   "scripts": {
     "test": "pnpm run lint && borp -T --concurrency=1 --timeout=180000 && tsd",

package/schema.json

@@ -1,6 +1,6 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/service/2.0.0-alpha.14.json",
-  "version": "2.0.0-alpha.14",
+  "$id": "https://schemas.platformatic.dev/@platformatic/service/2.0.0-alpha.16.json",
+  "version": "2.0.0-alpha.16",
   "title": "Platformatic Service",
   "type": "object",
   "properties": {
@@ -93,7 +93,24 @@
               "type": "object",
               "properties": {
                 "level": {
-                  "type": "string"
+                  "type": "string",
+                  "default": "info",
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "fatal",
+                        "error",
+                        "warn",
+                        "info",
+                        "debug",
+                        "trace",
+                        "silent"
+                      ]
+                    },
+                    {
+                      "pattern": "^\\{.+\\}$"
+                    }
+                  ]
                 },
                 "transport": {
                   "anyOf": [
@@ -154,6 +171,10 @@
                   "additionalProperties": false
                 }
               },
+              "required": [
+                "level"
+              ],
+              "default": {},
               "additionalProperties": true
             }
           ]