refactor(cli): move loglevel to log.level

Author: relu91

packages/cli/src/cli.ts

@@ -131,7 +131,7 @@ program.action(async function (_, options, cmd) {
 
     try {
         const config = await buildConfigFromFile(options, defaultFilePath, env, schemaValidator);
-        setLogLevel(options.logLevel ?? config.logLevel);
+        setLogLevel(options.logLevel ?? config.log.level);
         config.servient.clientOnly = options.clientOnly ?? config.servient.clientOnly;
         servient = new DefaultServient(config);
     } catch (err) {

packages/cli/src/configuration.ts

@@ -54,7 +54,7 @@ export const defaultConfiguration = Object.freeze({
         port: 5683,
     },
     credentials: {},
-    logLevel: "warn",
+    log: { level: "warn" },
 } as const satisfies Configuration);
 
 export type ConfigurationAfterDefaults = Merge<Configuration, Generalize<Mutable<typeof defaultConfiguration>>>;

packages/cli/src/wot-servient-schema.conf.json

@@ -124,9 +124,14 @@
             },
             "additionalProperties": false
         },
-        "logLevel": {
-            "type": "string",
-            "enum": ["debug", "info", "warn", "error"]
+        "log": {
+            "type": "object",
+            "properties": {
+                "level": {
+                    "type": "string",
+                    "enum": ["debug", "info", "warn", "error"]
+                }
+            }
         }
     },
     "additionalProperties": false

packages/cli/test/configuration.ts

@@ -54,7 +54,7 @@ class ConfigurationTest {
         expect(result).to.have.property("http");
         expect(result.http.port).to.equal(8080);
         expect(result.coap.port).to.equal(5683);
-        expect(result.logLevel).to.equal("warn");
+        expect(result.log.level).to.equal("warn");
     }
 
     @test async "should handle credentials in config"() {
@@ -101,7 +101,7 @@ class ConfigurationTest {
 
         expect(result.http.port).to.equal(8888);
         expect(result.coap.port).to.equal(defaultConfiguration.coap.port);
-        expect(result.logLevel).to.equal(defaultConfiguration.logLevel);
+        expect(result.log.level).to.equal(defaultConfiguration.log.level);
     }
 
     @test async "should read and build config from file"() {