x4js 2.3.4 → 2.3.6

package/cli/build-options.mjs

@@ -4,6 +4,7 @@ import { sassPlugin } from "esbuild-sass-plugin";
 import { lessPlugin } from "./less-plugin.mjs";
 import { copyPlugin } from "./copy-plugin.mjs";
 import { rawFilePlugin } from "./rawfile-plugin.mjs";
+import { diagnosticsPlugin } from "./diagnostic.mjs";
 
 const cliDir = path.dirname(fileURLToPath(import.meta.url));
 const devClient = path.join(cliDir, "dev-client.js");
@@ -26,6 +27,7 @@ export function createBuildOptions(config, mode) {
         charset: "utf8",
         keepNames: true,
         platform: "browser",
+		logLevel: "silent",
         format: "iife",
         target: "es2020",
         minify: production,
@@ -58,6 +60,9 @@ export function createBuildOptions(config, mode) {
             }),
             lessPlugin(config.root),
             copyPlugin(config, { dev }),
+
+			//last
+			...(dev ? [diagnosticsPlugin()] : []),
         ],
     };
 

package/cli/build.mjs

@@ -4,6 +4,7 @@ import esbuild from "esbuild";
 import { loadConfig } from "./config.mjs";
 import { createBuildOptions } from "./build-options.mjs";
 import { info, success } from "./log.mjs";
+import { printBuildError} from "./diagnostic-plugin.mjs";
 
 export async function build(argv = [], root = process.cwd()) {
     const { values, positionals } = parseArgs({
@@ -28,6 +29,19 @@ export async function build(argv = [], root = process.cwd()) {
     await fs.mkdir(config.outdir, { recursive: true });
 
     const started = performance.now();
-    await esbuild.build(createBuildOptions(config, mode));
-    success("built", `${Math.round(performance.now() - started)}ms`);
+	const options = createBuildOptions(config, mode);
+
+	try {
+		const result = await esbuild.build(options);
+		if (result.warnings.length)
+			await printWarnings(result.warnings);
+
+		logSuccess(`built      ${Date.now() - start}ms`);
+	}
+	catch (error) {
+		await printBuildError(error);
+		process.exitCode = 1;
+	}
+
+	success("built", `${Math.round(performance.now() - started)}ms`);
 }

package/cli/diagnostic-plugin.mjs

@@ -0,0 +1,73 @@
+import * as esbuild from "esbuild";
+import { styleText } from "node:util";
+
+function useColors() {
+    return process.stderr.isTTY && !process.env.NO_COLOR;
+}
+
+async function format(messages, kind) {
+    if (!messages?.length)
+        return [];
+
+    return esbuild.formatMessages(messages, {
+        kind,
+        color: useColors(),
+        terminalWidth: process.stderr.columns || 100,
+    });
+}
+
+export async function printWarnings(messages) {
+    const lines = await format(messages, "warning");
+
+    for (const line of lines)
+        process.stderr.write(line);
+}
+
+export async function printErrors(messages) {
+    if (!messages?.length)
+        return;
+
+    console.error(styleText("red", "\nbuild failed\n"));
+
+    const lines = await format(messages, "error");
+
+    for (const line of lines)
+        process.stderr.write(line);
+}
+
+export async function printBuildError(error) {
+    if (error?.errors?.length) {
+        await printErrors(error.errors);
+
+        if (error.warnings?.length)
+            await printWarnings(error.warnings);
+
+        return;
+    }
+
+    // Erreur x4 / Node, pas une erreur esbuild
+    console.error(
+        styleText(
+            "red",
+            error instanceof Error ? error.message : String(error)
+        )
+    );
+}
+
+export function diagnosticsPlugin() {
+    return {
+        name: "x4-diagnostics",
+
+        setup(build) {
+            build.onEnd(async (result) => {
+                if (result.errors.length) {
+                    await printErrors(result.errors);
+                    return;
+                }
+
+                if (result.warnings.length)
+                    await printWarnings(result.warnings);
+            });
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x4js",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "type": "module",
   "main": "src/x4.ts",
   "module": "src/x4.ts",

package/src/components/gridview/gridview.ts

@@ -33,7 +33,7 @@ import { _tr } from '../../core/core_i18n';
 
 import "./gridview.module.scss"
 
-export type CellRenderer = (rec: DataRecord) => Component;
+export type CellRenderer = (rec: DataRecord, col_id: any) => Component;
 export type CellClassifier = (data: any, rec: DataRecord, col: string ) => string;	// return the cell computed class
 
 type ColType = "number" | "money" | "checkbox" | "date" | "string" | "image" | "percent" | "icon" | "date-time";
@@ -694,6 +694,11 @@ export class Gridview<P extends GridviewProps = GridviewProps, E extends Gridvie
 			return null;
 		}
 
+        if( column.renderer ) {
+            const cell = column.renderer( rec, col );
+            return cell;
+        }
+
 		let cls = "";
 		if( column.classifier ) {
 			extra_cls.push( column.classifier( data, rec, col ) );