noxt-server 0.1.15 → 0.1.16

package/README.md

@@ -1,118 +1,5 @@
-# noxt-js
+# noxt-server
 
-A zero-config JSX web server powered by [Express](https://expressjs.com/) and [noxt-js-middleware](https://npmjs.com/package/noxt-js-middleware).  
-Run it with `npx noxt-js` and drop `.jsx` files into your `views/` folder — routes are created automatically.  
+Server stack for [noxt-js-middleware](https://npmjs.com/package/noxt-js-middleware)
 
-No React required. No heavy framework. Just JSX + Express.  
-
----
-
-## Installation
-
-```sh
-npm install noxt-js
-```
-
-or run it directly without installing:
-
-```sh
-npx noxt-js
-```
-
----
-
-## Quick Start
-
-```sh
-npx noxt-js
-```
-
-By default, this will:
-
-- Serve pages from `./views/`
-- Start an HTTP server on port `3000`
-- Look for configuration in `noxt.config.yaml` (optional)
-
----
-
-## Configuration
-
-`noxt-js` reads options from `noxt.config.yaml` in your project root, or from CLI flags.  
-CLI flags override config file values.
-
-Example `noxt.config.yaml`:
-
-```yaml
-port: 4000
-host: localhost
-views: views
-logLevel: info
-ssl: false
-```
-
-Run with CLI overrides:
-
-```sh
-npx noxt-js --port 8080 --views src/pages
-```
-
-### Available options
-
-- **`port`**: HTTP port number (default: `3000`)  
-- **`host`**: Hostname or IP (default: `0.0.0.0`)  
-- **`views`**: Directory containing `.jsx` files (default: `views`)  
-- **`logLevel`**: One of `error`, `warn`, `info`, `debug`  
-- **`ssl`**:  
-  - `false` (disable SSL)  
-  - or object with `cert` and `key` paths for HTTPS  
-
----
-
-## Context
-
-You can provide shared helpers/utilities to all components via a `context.js` file (or any path you specify in config). For example:
-
-```js
-// context.js
-export async function fetchUser(id) {
-  return db.users.findById(id);
-}
-```
-
-Then in a page:
-
-```jsx
-export const route = '/user/:id';
-
-export default async function UserPage({ id }, { fetchUser }) {
-  const user = await fetchUser(id);
-  return <h1>{user.name}</h1>;
-}
-```
-
----
-
-## Pages & Routing
-
-- Any `.jsx` file in `views/` is loaded as a component.  
-- If it exports `route`, it becomes a page at that route.  
-- Props come from route params, query string, and optional `params` export.  
-
-Example:
-
-```jsx
-export const route = '/hello/:name';
-
-export default function HelloPage({ name }) {
-  return <h1>Hello, {name}!</h1>;
-}
-```
-
----
-
-
----
-
-## License
-
-LGPL-3.0-or-later
+Run with [noxt-cli](https://npmjs.com/package/noxt-cli)

package/noxt-server.js

@@ -54,7 +54,7 @@ export async function startServer({ config, recipe, import: _import}) {
       '| Start', Number((afterStart - afterConfig) / 1_000_000n), 'ms',
     );
 
-    mlmInstance.repl();
+  mlm.DEV && mlmInstance.repl();
   } 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.15",
+  "version": "0.1.16",
   "description": "Server for noxt-js-middleware with CLI and config support",
   "type": "module",
   "main": "noxt-server.js",
@@ -23,8 +23,8 @@
   "author": "Zoran Obradović [https://github.com/zocky]",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "noxt-js-middleware": "^1.0.7",
-    "mlm-core": "^1.0.7",
+    "noxt-js-middleware": "^1.0.9",
+    "mlm-core": "^1.0.8",
     "express": "^5.1.0",
     "cookie-parser": "^1.4.6",
     "js-yaml": "^4.1.0"
@@ -33,10 +33,6 @@
     "compression": "^1.8.1",
     "sharp": "^0.34.5"
   },
-  "devDependencies": {
-    "noxt-js-middleware": "../noxt-js-middleware",
-    "mlm-core": "../mlm-core"
-  },
   "engines": {
     "node": ">=18"
   }

package/units/bundler.js

@@ -22,7 +22,17 @@ export default mlm => {
     'services.bundler': () => ({ styles, scripts }),
     'registerComponent.bundler': async ({ name, component, module }) => {
       styles[component.name] = module.style ? `/* ${name} */ \n ${module.style}\n` : '';
-      scripts[component.name] = module.script ? `/* ${name} */ \n ${module.script}\n` : '';
+
+      if (!module.script) return;
+
+      if (typeof module.script == 'string') {
+        scripts[component.name] = `/* ${name} */ \n (()=>{\n${module.script}\n})();\n\n`;
+        return
+      }
+      if (typeof module.script == 'function') {
+        scripts[component.name] = `/* ${name} */ \n (${module.script.toString()})(window);\n\n`;
+        return
+      }
     },
     'middleware.bundler': () => {
       const router = mlm.services.express.Router();

package/units/bust-cache.js

@@ -0,0 +1,30 @@
+export const info = {
+  name: 'bust-cache',
+  version: '1.0.0',
+  description: 'Bust cache on GET requests',
+  requires: ['express'],
+}
+
+export default mlm => ({
+  'hook.bustCache': async (fn, req) => {
+    req.bustCache ||= fn(req);
+  },
+  'prod.middleware.bustCache': async () => {
+    return (req, res, next) => {
+      if (req.method === 'GET') {
+        mlm.hook.bustCache(req);
+      }
+      next();
+    };
+  },
+  'dev.middleware.bustCache': () => {
+    return (req, res, next) => {
+      if (req.method === 'GET') {
+        if (req.headers['cache-control']?.includes('no-cache')) {
+          req.bustCache = true;
+        }
+      }
+      next();
+    };
+  },
+});

package/units/compression.js

@@ -4,10 +4,7 @@ export const info = {
   version: '1.0.0',
   description: 'Response compression',
   requires: ['express'],
-  npm: {
-    'compression': '^1.8.0'
-  },
-
+  packages: ['compression'],
 }
 
 export default mlm => ({
@@ -27,7 +24,7 @@ export default mlm => ({
   'middleware.compression': async () => {
     const { enabled, level, threshold } = mlm.config.compression;
     if (!enabled) return null;
-    const compression = (await mlm.import('compression')).default;
+    const compression = mlm.packages.compression.default;
     return compression({ level, threshold });
   },
 });

package/units/env.js

@@ -9,6 +9,7 @@ export default mlm => ({
   'define.PROD': () => process.env.NODE_ENV === 'production',
   'onBeforeLoad': () => {
     process.env.NODE_ENV ||= 'development'
-  }
+  },
+  'inject.dev': (confs, unit) => mlm.DEV ? confs : null,
+  'inject.prod': (confs, unit) => !mlm.DEV ? confs : null,
 })
-  

package/units/express.js

@@ -2,17 +2,14 @@ export const info = {
   name: 'express',
   description: 'Sets up an Express server',
   requires: ['plugin'],
-  npm: {
-    'express': '^5.0.0',
-    'cookie-parser': '^1.4.6'
-  },
+  packages: ['express'],
 }
 
 export default async mlm => {
   let app;
   const middlewareNames = new Set();
   const middlewares = [];
-  const { default: express } = await mlm.import('express');
+  const { default: express } = mlm.packages.express;
   return {
     'services.express': () => new class {
       get app () {

package/units/hooks.js

@@ -34,7 +34,7 @@ export default mlm => {
     'collect.on': {
       target: hook_handlers,
       is: 'function',
-      mode: 'array'
+      mode: 'arrays'
     }
   })
 }

package/units/image-resizer.js

@@ -3,9 +3,7 @@ export const info = {
   description: 'Image resizing and caching service',
   requires: ['express'],
   provides: ['#image-resizer'],
-  npm: {
-    'sharp': '^0.33.0',
-  },
+  packages: ['sharp','express']
 }
 
 import crypto from 'crypto';
@@ -35,7 +33,7 @@ function getShardedPath(hash, ext, depth, segmentLength) {
 }
 
 export default async mlm => {
-   const sharp = (await mlm.import('sharp')).default;
+  const {default:sharp} = mlm.packages.sharp;
 
   async function getMetadata(hash) {
     const shardPath = getShardedPath(hash, 'json', mlm.config.imageResizer.shardDepth, mlm.config.imageResizer.shardSegmentLength);
@@ -82,26 +80,13 @@ export default async mlm => {
       const resizeOptions = {
         width: +options.width || null,
         height: +options.height || null,
-        fit: options.fit === 'crop' ? 'cover' : options.fit,
-        withoutEnlargement: options.fit === 'crop'
+        fit: options.fit || 'inside',
       };
 
-      // Add background color if specified (for contain fit letterboxing)
       if (options.background) {
         resizeOptions.background = options.background;
       }
-
       image = image.resize(resizeOptions);
-
-      // If crop fit, extract exact dimensions
-      if (options.fit === 'crop' && options.width && options.height) {
-        image = image.extract({
-          left: 0,
-          top: 0,
-          width: +options.width,
-          height: +options.height
-        });
-      }
     }
 
     // Set format and quality
@@ -206,7 +191,7 @@ export default async mlm => {
     }),
 
     'middleware.imageResizerServe': async () => {
-      const { default: express } = await mlm.import('express');
+      const { default: express } = mlm.packages.express;
       const router = express.Router();
 
       // Static middleware runs FIRST, mounted at the configured route
@@ -216,12 +201,14 @@ export default async mlm => {
         setHeaders: res => res.logGroup = 'static',
       }));
 
-      return router;
+      return (req,res,next) => {
+        if (req.bustCache) return next();
+        router(req, res, next);
+      }
     },
 
     'middleware.imageResizerProcess': async () => {
-      const { default: express } = await mlm.import('express');
-      const router = express.Router();
+      const router = mlm.packages.express.Router();
 
       // This runs SECOND, only if static didn't find the file
       router.get(`${mlm.config.imageResizer.route}/*path`, async (req, res, next) => {
@@ -238,8 +225,6 @@ export default async mlm => {
             return res.status(404).send('Image not found');
           }
 
-          const noCache = req.headers.pragma === 'no-cache' ||
-            req.headers['cache-control']?.includes('no-cache');
 
           // Process and serve the image
           try {

package/units/logger.js

@@ -55,7 +55,7 @@ export default mlm => ({
           (res._realBodySize / 1024).toFixed(0).padStart(4, ' ') + 'K',
           res.statusCode,
           req.method + ' ' +
-          req.originalUrl || req.url,
+          (req.originalUrl || req.url),
           //ua
         ]
         mlm.log(parts.join(' | '));

package/units/noxt-dev.js

@@ -4,12 +4,12 @@ export const info = {
   requires: [
     'express',
     'logger',
+    'bundler',
     'reload',
     'compression',
-    'static-dev',
+    'static',
     'fetch-cache-fs',
-    'bundler',
-    'noxt-router-dev',
+    'noxt-router',
     'fetch',
   ],
 }

package/units/noxt-plugin.js

@@ -6,6 +6,7 @@ export const info = {
 
 
 export default mlm => {
+  const requestApi = {};
   const componentErrorHooks = {};
   const requestContextHooks = {};
   const serverContextHooks = {};
@@ -21,6 +22,15 @@ export default mlm => {
       is: 'function',
       mode: 'object'
     },
+    'collect.api': {
+      target: requestApi,
+      is: 'function',
+      mode: 'object',
+    },
+    'requestContext.api': ({ ctx }) => new Proxy({}, {
+      ownKeys: () => Object.keys(requestApi),
+      get: (target, key) => (target[key] ??= requestApi[key]?.({ctx}))
+    }),
     'collect.componentExports': {
       target: componentExportsHooks,
       is: 'object',
@@ -106,8 +116,8 @@ export default mlm => {
     },
     'registerPage.Link'({ component, module }) {
       const As = module.Link ?? 'a';
-      component.Link = ({ text, children, attrs, ...props }, ctx) => {
-        const href = component.getRoutePath(props, ctx);
+      component.Link = ({ text, children, params={}, ...attrs }, ctx) => {
+        const href = component.getRoutePath(params, ctx);
         return { type: As, props: { ...attrs, href, children: text ?? children } };
       }
     },

package/units/noxt-router.js

@@ -3,9 +3,9 @@ export const info = {
   description: 'Sets up a Noxt Router',
   requires: ['noxt-plugin'],
   provides: ['#noxt-router'],
-  npm: {
-    'noxt-js-middleware': '^1.0.4'
-  },
+  packages: {
+    noxt: 'noxt-js-middleware'
+  }
 }
 
 export default mlm => ({
@@ -14,12 +14,30 @@ export default mlm => ({
     is: ['string'],
     default: ['views']
   },
-  'middleware.noxt': async (app) => {
-    const { default: noxt } = await mlm.import('noxt-js-middleware');
+  'prod.middleware.noxt': async (app) => {
+    const { default: noxt } = mlm.packages.noxt;
+    const noxtRouter = await noxt({
+      context: mlm.services.noxt.context,
+      views: mlm.config.views,
+      hooks: mlm.services.noxt.hooks,
+    })
+    return noxtRouter
+  },
+  'dev.middleware.noxt': async (app) => {
+    const { default: noxt } = mlm.packages.noxt;
     const noxtRouter = await noxt({
+      context: mlm.services.noxt.context,
       views: mlm.config.views,
-      hooks: mlm.services.noxt.hooks
+      hooks: mlm.services.noxt.hooks,
+      watch: true
     })
     return noxtRouter
   },
+  'dev.componentChanged.reload': ({ name, component }) => {
+    mlm.services.reload.refresh();
+  },
+  'dev.componentError.reload': async ({ name, error }) => {
+    mlm.services.reload.error(error);
+  },
+  'dev.requestContext.reload': ({ ctx }) => ctx.slot('script', 'noxt-reload', '/_reload.js'),
 })

package/units/plugin.js

@@ -1,6 +1,6 @@
 export const info = {
   name: 'plugin',
   version: '1.0.0',
-  description: 'Base',
+  description: 'Plugin base',
   requires: ['env','utils','services','hooks','config']
 }

package/units/services.js

@@ -5,17 +5,21 @@ export const info = {
   requires: ['utils']
 }
 
-const services = {}
 
-export default mlm => ({
-  'define.services': () => mlm.utils.readOnly(services, 'services'),
-  'register.services': mlm.utils.collector(services, {
-    is: 'function',
-    mode: 'object',
-    map: (fn, key) => {
-      const service = fn(mlm)
-      mlm.assert.is.object(service, 'service');
-      return service
+export default mlm => {
+  const services = {}
+
+  return {
+    'define.services': () => mlm.utils.readOnly(services, 'services'),
+    'collect.services': {
+      target: services,
+      is: 'function',
+      mode: 'object',
+      map: (fn, key) => {
+        const service = fn(mlm)
+        mlm.assert.is.object(service, 'service');
+        return service
+      }
     }
-  }),
-})
+  }
+}

package/units/static.js

@@ -1,25 +1,49 @@
-import fs from "fs";
 export const info = {
   name: 'static',
   description: 'Static middleware',
   requires: ['express'],
+  packages: ['express']
 }
 
 import { resolve } from 'path';
+import fs from 'fs';
 
-export default mlm => ({
-  'config.static': {
-    is:   'string',
-    default: 'public',
-    
-  },
+export default mlm => {
+  let watcher;
+  return {
+    'config.static': {
+      is: 'string',
+      default: 'public',
+    },
 
-  'middleware.static': async () => {
-    const dir = mlm.config.static;
-    if (!dir) return null;
-    const { static: serveStatic } = await mlm.import('express');
-    return serveStatic(resolve(dir), {
-      setHeaders: res => res.logGroup = 'static',
-    });
-  },
-})
+    'prod.middleware.static': async () => {
+      const dir = mlm.config.static;
+      if (!dir) return null;
+      return mlm.packages.express.static(resolve(dir), {
+        setHeaders: res => res.logGroup = 'static',
+      });
+    },
+    'dev.middleware.static': async () => {
+      const dir = mlm.config.static;
+      if (!dir) return null;
+      return mlm.packages.express.static(resolve(dir), {
+        etag: false,
+        cacheControl: false,
+        setHeaders: res => res.logGroup = 'static',
+      });
+    },
+    'dev.onStart'() {
+      const dir = mlm.config.static;
+      if (!dir) return;
+      watcher = fs.watch(dir, { recursive: true }, mlm.utils.debounce(() => {
+        mlm.services.reload.refresh()
+      }, 50))
+    },
+    'dev.onStop'() {
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+    }
+  }
+}

package/units/utils.js

@@ -81,20 +81,15 @@ export default mlm => {
   
   return ({
     'define.utils': () => utils.readOnly(utils, 'utils'),
-    'register.collect': async (confs,unit) => {
+    'register.utils': utils.collector(utils, { is: 'function', mode: 'object', map: (fn, key) => { mlm.log('utils', key); return fn; } }),
+    'inject.collect': async (confs,unit) => {
+      const ret = {}
       for (const key in confs) {
         const { target, ...conf } = confs[key];
         conf.label = key;
-        await mlm.inject({
-          [`register.${key}`]: utils.collector(target, conf),
-        }, unit);
-        if (unit[key]) {
-          mlm.inject({
-            [key]: unit[key]
-          }, unit);
-        }
+        ret[key] = utils.collector(target, conf);
       }
+      return {register:ret}
     },
-    'register.utils': utils.collector(utils, { is: 'function', mode: 'object', map: (fn, key) => { mlm.log('utils', key); return fn; } }),
   })
 }

package/units/noxt-router-dev.js

@@ -1,43 +0,0 @@
-export const info = {
-  name: 'noxt-router-dev',
-  description: 'Sets up a Noxt Router',
-  requires: ['noxt-plugin','reload'],
-  provides: ['#noxt-router'],
-  npm: {
-    'noxt-js-middleware': '^1.0.4'
-  },
-}
-
-export default mlm => ({
-  'config.views': {
-    normalize: p => [p].flat(),
-    is: ['string'],
-    default: ['views']
-  },
-  'middleware.noxt': async () => {
-    const { default: noxt } = await mlm.import('noxt-js-middleware');
-    const noxtRouter = await noxt({
-      context: mlm.services.noxt.context,
-      views: mlm.config.views,
-      hooks: mlm.services.noxt.hooks,
-      watch: true
-    })
-    /*
-    const devRouter = await noxt({
-      context: mlm.noxt_context,
-      views: mlm.config.views,
-      hooks: mlm.services.noxt.noxt_hooks,
-      noxt: noxtRouter
-    })
-    //noxtRouter.use('/dev', devRouter)
-    */
-    return noxtRouter
-  },
-  'componentChanged.reload': ({ name, component }) => {
-    mlm.services.reload.refresh();
-  },
-  'componentError.reload': async ({ name, error }) => {
-    mlm.services.reload.error(error);
-  },
-  'requestContext.reload': ({ ctx }) => ctx.slot('script', 'noxt-reload', '/_reload.js'),
-})

package/units/static-dev.js

@@ -1,42 +0,0 @@
-import fs from "fs";
-export const info = {
-  name: 'static-dev',
-  description: 'Static dev middleware',
-  requires: ['express', 'reload'],
-}
-
-import { resolve } from 'path';
-
-export default mlm => {
-  let watcher = null;
-  return {
-    'config.static': {
-      is: 'string',
-      default: 'public',
-
-    },
-
-    'middleware.static': async () => {
-      const dir = mlm.config.static;
-      if (!dir) return null;
-
-      watcher = fs.watch(dir, { recursive: true }, mlm.utils.debounce(() => {
-        mlm.services.reload.refresh()
-      }, 50))
-
-      const { static: serveStatic } = await mlm.import('express');
-      return serveStatic(resolve(dir), {
-        etag: false,
-        cacheControl: false,
-        setHeaders: res => res.logGroup = 'static',
-      });
-    },
-    onStop() {
-      const dir = mlm.config.static;
-      if (watcher) {
-        watcher.close();
-        watcher = null;
-      }
-    }
-  }
-}