x4js 2.0.12 → 2.0.14

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "x4js",
-	"version": "2.0.12",
+	"version": "2.0.14",
 	"description": "X4 framework",
 	"author": "etienne cochard",
 	"main": "src/x4.ts",
-	"types": "lib/types/x4js.d.ts",
-	"files": [
+	"typess": "lib/types/x4js.d.ts",
+	"filess": [
 		"lib/**/*"
 	],
 	"license": "MIT",
@@ -31,7 +31,7 @@
 	},
 	"homepage": "https://x4js.org",
 	"module": "lib/esm/x4.mjs",
-	"exports": {
+	"exportss": {
 		".": {
 			"import": {
 				"types": "./lib/types/x4.d.ts",
@@ -45,11 +45,10 @@
 	},
 	"devDependencies": {
 		"chalk": "^5.3",
-		"dts-generator": "^3.0",
 		"esbuild": "^0.24",
 		"esbuild-plugin-d.ts": "^1.3",
 		"esbuild-sass-plugin": "^3.3",
-		"typescript": "^5.6",
+		"typescript": "^5.6.3",
 		"watcher": "^2.3",
 		"ws": "^8.18"
 	},

package/scripts/build.mjs

@@ -0,0 +1,378 @@
+#!/usr/bin/env node
+
+/**
+* @file build.mjs
+* @author Etienne Cochard 
+* @copyright (c) 2024 R-libre ingenierie, all rights reserved.
+* @version 1.2
+**/
+
+import * as fs from "node:fs"
+import * as path from "node:path"
+import * as url from "node:url"
+import * as http from "node:http"
+
+import chalk from "chalk"
+import esbuild from "esbuild"
+import { WebSocketServer } from 'ws';
+import Watcher from "watcher"
+
+import { sassPlugin } from "esbuild-sass-plugin";
+import { dtsPlugin } from "esbuild-plugin-d.ts";
+//import { hostname } from 'node:os'
+
+console.log( chalk.green("\n\n-- X4Build 1.2 -------------------") );
+
+const releaseMode = process.argv.some(a => a == "--release")
+const hmrMode = process.argv.some(a => a == "--hmr")		// hot module replacement
+const watchMode = process.argv.some(a => a == "--watch" )	// watch modifications
+const serveMode = process.argv.some(a => a == "--serve")	// watch modifications
+const cjsMode = process.argv.some(a => a == "--cjs")		// output mode 
+const dtsMode = process.argv.some(a => a == "--dts")		// generate .d.ts
+
+// forced outdir in command line
+let outDir = process.argv.find( a => a.startsWith("--outdir=") );
+if( outDir ) {
+	outDir = outDir.substring(9);
+}
+
+console.log( "outdir =", outDir );
+
+
+function readPackage() {
+
+	let cpath = process.cwd();
+
+	// check here
+	let pth = path.join(cpath, "package.json");
+	if (fs.existsSync(pth)) {
+		const raw = fs.readFileSync(pth, "utf-8");
+		return JSON.parse(raw);
+	}
+
+	throw new Error("cannot find package.json");
+}
+
+const def_settings = {
+	"outdir": "./bin",
+	"copy": [],
+};
+
+const pkg_settings = readPackage();
+const settings = { ...def_settings, ...pkg_settings.x4build };
+
+if( !settings.entryPoints ) {
+	settings.entryPoints = [pkg_settings.main];
+}
+
+if( outDir ) {
+	settings.outdir = outDir;
+}
+
+console.log( chalk.green("    release mode ..", releaseMode ) );
+console.log( chalk.green("    hmr ...........", hmrMode ) );
+console.log( chalk.green("    watching ......", watchMode ) );
+console.log( chalk.green("    serve files ...", serveMode ) );
+console.log( chalk.green("    output dir ....", settings.outdir ) );
+console.log( chalk.green("    entry point ...", settings.entryPoints ) );
+console.log( chalk.green("    generate .d.ts.", dtsMode ) );
+console.log( chalk.green("    copying .......", settings.copy ) );
+
+console.log( chalk.green("----------------------------------") );
+
+
+
+
+const js_hmr = ` // X4 Hot Module Replacement v1.1
+{
+	const ws = new WebSocket( "ws://127.0.0.1:9998", "hmr" );
+
+	ws.onmessage = ( ev ) => {
+		if( ev.data=="reload-css" ) {
+			const gen_id = Date.now( );
+			document.querySelectorAll( "link[rel=stylesheet]").forEach( link => {
+				link.href = link.href.replace(/\\?.*|$/, "?" + gen_id)
+			} );
+		}
+		else {
+			location.reload(); 
+		}
+	}
+}`
+
+/** custom plugin to copy element after the build */
+
+const post_plugin = {
+	name: 'post-cmd',
+	setup(build) {
+
+		build.onEnd(result => {
+			if (result.errors.length) {
+				console.error(`build ended with ${result.errors.length} errors`)
+			}
+			else {
+				settings.copy?.forEach((desc) => {
+					const { from, to } = desc;
+
+					if (fs.existsSync(from)) {
+						fs.cpSync(from, path.join(settings.outdir, to), { recursive: true });
+					}
+				});
+			}
+		})
+	},
+}
+
+let buildcnt = 1;
+
+const other_plugins = [];
+
+if( dtsMode ) {
+	other_plugins.push( dtsPlugin( {
+	}) );
+}
+
+async function build() {
+
+	console.log(chalk.cyan(`building (${buildcnt++})...`));
+
+	try {
+		/** @type {esbuild.BuildOptions} */
+		const options = {
+			target: "node12",
+			logLevel: "error",
+			entryPoints: settings.entryPoints,
+			bundle: true,
+			charset: "utf8",
+			outdir: settings.outdir,
+			keepNames: true,
+			platform: "browser",
+			format: cjsMode ? "cjs" : "esm",
+			minify: releaseMode,
+			plugins: [ 
+				sassPlugin( {
+					type: "css",
+					filter: /\.scss$/,
+				}), 
+				post_plugin,
+				...other_plugins,
+			],
+			assetNames: "assets/[name]-[hash]",
+			loader: {
+				".svg": "dataurl",
+				".jpg": "file",
+				".png": "file",
+				".woff": "file",
+				".woff2": "file",
+			}
+		}
+
+		if (!releaseMode) {
+			options.sourcemap = "inline";
+		}
+
+		if (hmrMode) {
+			options.banner = { js: js_hmr }
+		}
+
+		await esbuild.build(options);
+	}
+	catch (e) {
+		console.error(chalk.bgRed.white("build failure, waiting for correction"));
+		console.log(e.message);
+	}
+}
+
+// :: WEBSOCKET SERVER FOR HRM ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+if (watchMode) {
+
+	const wsServer = new WebSocketServer({
+		port: 9998
+	});
+
+	// all connected clients (1)
+	const clients = [];
+
+	wsServer.on('connection', (ws) => {
+		clients.push(ws);
+
+		wsServer.on('error', (err) => {
+		});
+
+		wsServer.on('message', function message(data) {
+			console.log('received: %s', data);
+		});
+	});
+
+	const sendClientMessage = (msg) => {
+		clients.forEach(ws => {
+			ws.send(msg);
+		});
+	}
+
+	// file watcher ------------------------------------------
+	const selfPath = url.fileURLToPath(import.meta.url);
+	const cPath = process.cwd();
+
+	const watcher = new Watcher("./", {
+		recursive: true,
+		ignoreInitial: true,
+		ignore: (targetPath) => {
+			if (targetPath.startsWith(cPath)) {
+				targetPath = path.join(".", targetPath.substring(cPath.length));
+				targetPath = path.normalize(targetPath);
+			}
+
+			if (targetPath.startsWith(settings.outdir) || targetPath.startsWith("node_modules") ) {
+				//console.log("skip watch", targetPath);
+				return true;
+			}
+
+			return false;
+		}
+	});
+
+
+	watcher.on('all', async (event, targetPath, targetPathNext) => {
+		
+		if (event == "change" || event == "add") {
+			// one of our copy path ?
+			if (targetPath.startsWith(cPath)) {
+				let pth = "." + targetPath.substring(cPath.length);
+				pth = path.normalize(pth);
+
+				//console.log( targetPath );
+				if (settings.copy?.some(desc => {
+					const from = path.normalize(desc.from);
+					if (pth == from || pth.startsWith(from)) {
+						return true;
+					}
+				})) {
+					await build();
+					return;
+				}
+			}
+		}
+		
+		if (event == "change") {
+			// somebody changed this file, so leave
+			if (targetPath == selfPath) {
+				process.exit(0);
+			}
+
+			// depending of the extension, we send the correct type of refresh
+			switch (path.extname(targetPath)) {
+				case ".svg":
+				case ".css":
+				case ".scss": {
+					await build();
+					sendClientMessage("reload-css");
+					break;
+				}
+
+				case ".html":
+				case ".ts":
+				case ".js":
+				case ".jsx":
+				case ".tsx": {
+					await build();
+					sendClientMessage("reload-js");
+					break;
+				}
+
+				case ".json": {
+					if (path.basename(targetPath) == 'package.json') {
+						build();
+					}
+					break;
+				}
+			}
+
+			//console.log ( event ); // => could be any target event: 'add', 'addDir', 'change', 'rename', 'renameDir', 'unlink' or 'unlinkDir'
+			//console.log ( targetPath ); // => the file system path where the event took place, this is always provided
+		}
+	});
+}
+
+// :: WEB SERVER ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+function serve() {
+
+	// maps file extention to MIME types
+	// full list can be found here: https://www.freeformatter.com/mime-types-list.html
+	const mimeType = {
+		'.ico': 'image/x-icon',
+		'.html': 'text/html',
+		'.js': 'text/javascript',
+		'.json': 'application/json',
+		'.css': 'text/css',
+		'.png': 'image/png',
+		'.jpg': 'image/jpeg',
+		'.wav': 'audio/wav',
+		'.mp3': 'audio/mpeg',
+		'.svg': 'image/svg+xml',
+		'.pdf': 'application/pdf',
+		'.zip': 'application/zip',
+		'.doc': 'application/msword',
+		'.eot': 'application/vnd.ms-fontobject',
+		'.ttf': 'application/x-font-ttf',
+	};
+	
+	const server = http.createServer( {
+		hostname: "127.0.0.1"
+	});
+
+	server.on('request', (req, res) => {
+		//console.log(`${req.method} ${req.url}`);
+
+		// parse URL
+		const parsedUrl = url.parse(req.url);
+
+		// extract URL path
+		// Avoid https://en.wikipedia.org/wiki/Directory_traversal_attack
+		// e.g curl --path-as-is http://localhost:9000/../fileInDanger.txt
+		// by limiting the path to current directory only
+		const sanitizePath = path.normalize(parsedUrl.pathname).replace(/^(\.\.[\/\\])+/, '');
+		let pathname = path.join(settings.outdir, sanitizePath);
+
+		if( fs.existsSync(pathname) ) {
+			// if is a directory, then look for index.html
+			if (fs.statSync(pathname).isDirectory()) {
+				pathname = path.join( pathname, 'index.html' );
+			}
+
+			// read file from file system
+			fs.readFile(pathname, function (err, data) {
+				if (err) {
+					res.statusCode = 500;
+					res.end(`Error getting the file: ${err}.`);
+				} 
+				else {
+					// based on the URL path, extract the file extention. e.g. .js, .doc, ...
+					const ext = path.parse(pathname).ext;
+					// if the file is found, set Content-type and send data
+					res.setHeader('Content-type', mimeType[ext] || 'text/plain');
+					res.end(data);
+				}
+			});
+		}
+		else {
+			// if the file is not found, return 404
+			res.statusCode = 404;
+			res.end(`File ${pathname} not found!`);
+			return;
+		}
+	});
+
+	server.listen(3000);
+	console.log( chalk.yellow("listening on http://127.0.0.1:3000") );
+}
+
+build();
+
+if( serveMode ) {
+	serve();
+}
+
+