noxt-server 0.1.6 → 0.1.13

package/noxt-server.js

@@ -16,14 +16,20 @@ export async function startServer({ config, recipe }) {
         : `${__dirname}/units/${name}.js`
   });
   try {
+
     const report = await mlmInstance.analyze(recipe ?? 'noxt-dev');
     if (!report.success) {
-      console.log(report.order.join(', '));
+      console.log('Bad recipe: ' + recipe + '\n' + report.order.join(', '));
+      console.log(report.errors.join('\n'));
       process.exit(1);
     }
     
     await mlmInstance.install(recipe ?? 'noxt-dev');
-    await mlmInstance.start(config);
+    const mlm = mlmInstance.context;
+    await mlm.services.config.merge(config);
+    console.log(mlm.config);
+    await mlmInstance.start();
+
   } catch (e) {
     console.log(await mlmInstance.analyze(recipe ?? 'noxt-dev'));
     console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noxt-server",
-  "version": "0.1.6",
+  "version": "0.1.13",
   "description": "Server for noxt-js-middleware with CLI and config support",
   "type": "module",
   "main": "noxt-server.js",

package/units/config.js

@@ -10,34 +10,47 @@ const config_defaults = {};
 const config_defs = {}
 
 function merge_deep(target, ...sources) {
-  if (!sources.length) return target;
-  
-  const source = sources.shift();
-  
-  if (is_plain(target) && is_plain(source)) {
-    for (const key in source) {
-      if (source.hasOwnProperty(key)) {
-        // If target doesn't have this key, simply assign
-        if (!target.hasOwnProperty(key)) {
-          target[key] = source[key];
-        } 
-        // If both target and source have this key and both are plain objects, recurse
-        else if (is_plain(target[key]) && is_plain(source[key])) {
-          merge_deep(target[key], source[key]);
+    // If no sources, return target
+    if (sources.length === 0) return target;
+    
+    // If target is not a plain object, return the first source (overwrite)
+    if (!isPlainObject(target)) {
+        return sources[0];
+    }
+    
+    const result = Object.assign({}, target);
+    
+    for (const source of sources) {
+        // If source is not a plain object, skip (treat as scalar)
+        if (!isPlainObject(source)) {
+            continue;
+        }
+        
+        for (const [key, sourceValue] of Object.entries(source)) {
+            const targetValue = result[key];
+            
+            // If both values are plain objects, merge recursively
+            if (isPlainObject(targetValue) && isPlainObject(sourceValue)) {
+                result[key] = merge_deep(targetValue, sourceValue);
+            } 
+            // Otherwise, overwrite target with source value
+            else {
+                result[key] = sourceValue;
+            }
         }
-        // If target has a non-plain object value, ignore (don't overwrite or try to merge into it)
-        // else: do nothing (keep target's existing value)
-      }
     }
-  }
-  
-  return merge_deep(target, ...sources);
+    
+    return result;
 }
 
-function is_plain(obj) {
-  return obj !== null && 
-         typeof obj === 'object' && 
-         (obj.constructor === Object || obj.constructor === null);
+// Helper function to check if value is a plain object
+function isPlainObject(value) {
+    if (value === null || typeof value !== 'object') {
+        return false;
+    }
+    
+    const proto = Object.getPrototypeOf(value);
+    return proto === null || proto === Object.prototype;
 }
 
 export default mlm => ({
@@ -48,13 +61,15 @@ export default mlm => ({
       mlm.assert.not(key in config_defs, 'Duplicate config key ' + key);
       mlm.assert.is({
         is: 'any|none',
-        default: 'any|none'
+        default: 'any|none',
+        normalize: 'function|none'
       }, def, `config.${key}`);
 
       if ('default' in def) {
         config_defaults[key] = mlm.utils.eval(def.default);
       }
       config_defs[key] = {
+        normalize: def.normalize,
         is: def.is,
         default: def.default,
         unit: unit
@@ -67,14 +82,23 @@ export default mlm => ({
       const merged = merge_deep({}, config_defaults, config);
       const ret = {};
       for (const key in config_defs) {
-        const { is: type } = config_defs[key];
+        const { is: type, normalize } = config_defs[key];
         if (key in merged) {
+          if (normalize) {
+            merged[key] = normalize(merged[key]);
+          }
+
           mlm.assert.is(type, merged[key], `config.${key}`);
           ret[key] = merged[key];
         }
       }
       return ret;
     }
+    merge(config) {
+      mlm.log('config', config,mlm.config);
+      Object.assign(mlm.config, this.process(config));
+      
+    }
     get_defs() {
       return {
         config_defs,
@@ -83,7 +107,4 @@ export default mlm => ({
       };
     }
   },
-  onStart(config) {
-    Object.assign(mlm.config, mlm.services.config.process(config));
-  }
 })

package/units/express.js

@@ -48,10 +48,6 @@ export default mlm => ({
   async onStart() {
     const { default: express } = await mlm.import('express');
     app = express();
-    app.use((req, res, next) => {
-      mlm.log(req.method, req.url);
-      next();
-    })
     for (const middleware of middlewares) {
       const mw = await middleware.create(app);
       if (middleware.path) {

package/units/logger.js

@@ -8,7 +8,7 @@ export const info = {
 export default mlm => ({
   'middleware.logger': async (app) => {
      return (req, res, next) => {
-        console.log(req.method, req.url);
+        mlm.log(req.method, req.url);
         next();
      }
   },

package/units/noxt-router-dev.js

@@ -10,6 +10,7 @@ export const info = {
 
 export default mlm => ({
   'config.views': {
+    normalize: p => [p].flat(),
     is: ['string'],
     default: ['views']
   },

package/units/noxt-router.js

@@ -10,6 +10,7 @@ export const info = {
 
 export default mlm => ({
   'config.views': {
+    normalize: p => [p].flat(),
     is: ['string'],
     default: ['views']
   },