jsgui3-server 0.0.148 → 0.0.150

package/resources/processors/bundlers/js/esbuild/Advanced_JS_Bundler_Using_ESBuild.js

@@ -5,7 +5,8 @@ const Core_JS_Non_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Non_Minif
 const Bundler_Using_ESBuild = require('./Bundler_Using_ESBuild');
 const {is_array} = require('lang-tools');
 
-const Core_JS_Single_File_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Single_File_Minifying_Bundler_Using_ESBuild');
+const Core_JS_Single_File_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Single_File_Minifying_Bundler_Using_ESBuild');
+const JSGUI3_HTML_Control_Optimizer = require('./JSGUI3_HTML_Control_Optimizer');
 
 //const CSS_Extractor = require('./_Old_CSS_Extractor');
 
@@ -14,20 +15,55 @@ const Core_JS_Single_File_Minifying_Bundler_Using_ESBuild = require('./Core_JS_S
 
 const Bundle = require('../../bundle');
 
-const CSS_And_JS_From_JS_String_Extractor = require('../../../extractors/js/css_and_js/CSS_And_JS_From_JS_String_Extractor');
-const {compile_styles} = require('../../style-bundler');
-
-
-class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
+const CSS_And_JS_From_JS_String_Extractor = require('../../../extractors/js/css_and_js/CSS_And_JS_From_JS_String_Extractor');
+const {compile_styles} = require('../../style-bundler');
+
+const await_bundle_observable = (bundle_result) => {
+    if (!bundle_result || typeof bundle_result.on !== 'function') {
+        return Promise.resolve(bundle_result);
+    }
+
+    const normalize_result = (value) => {
+        if (Array.isArray(value)) return value;
+        if (value && value._arr) return [value];
+        return value;
+    };
+
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const settle_once = (settle_fn, value) => {
+            if (settled) return;
+            settled = true;
+            settle_fn(value);
+        };
+
+        bundle_result.on('error', (error) => settle_once(reject, error));
+        bundle_result.on('next', (value) => settle_once(resolve, normalize_result(value)));
+        bundle_result.on('complete', (value) => settle_once(resolve, normalize_result(value)));
+    });
+};
+
+
+class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
     constructor(spec = {}) {
         super(spec);
 
         if (spec.debug !== undefined) this.debug = spec.debug;
 
-        // Store bundler configuration
-        this.bundler_config = spec.bundler || {};
-        const style_config = spec.style || this.bundler_config.style || {};
-        this.style_config = Object.assign({debug: this.debug === true}, style_config);
+        // Store bundler configuration
+        this.bundler_config = spec.bundler || {};
+
+        // Enable elimination by default, while preserving explicit opt-out.
+        const raw_elimination_config = this.bundler_config.elimination;
+        if (raw_elimination_config === false) {
+            this.elimination_config = {enabled: false};
+        } else if (raw_elimination_config && typeof raw_elimination_config === 'object') {
+            this.elimination_config = raw_elimination_config;
+        } else {
+            this.elimination_config = {};
+        }
+        const style_config = spec.style || this.bundler_config.style || {};
+        this.style_config = Object.assign({debug: this.debug === true}, style_config);
 
         //this.css_extractor = new CSS_Extractor();
 
@@ -42,14 +78,45 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
         // Probably don't use that minifying bundler in debug mode.
-        this.minifying_js_single_file_bundler = new Core_JS_Single_File_Minifying_Bundler_Using_ESBuild({
-            minify: this.bundler_config.minify
-        });
-
-    }
+        this.minifying_js_single_file_bundler = new Core_JS_Single_File_Minifying_Bundler_Using_ESBuild({
+            minify: this.bundler_config.minify
+        });
+
+        const control_elimination_config = this.elimination_config.jsgui3_html_controls || {};
+        const elimination_enabled = this.elimination_config.enabled !== false;
+        const control_elimination_enabled = elimination_enabled &&
+            control_elimination_config.enabled !== false;
+
+        if (control_elimination_enabled) {
+            const cache_config = control_elimination_config.cache && typeof control_elimination_config.cache === 'object'
+                ? control_elimination_config.cache
+                : {};
+            this.jsgui3_html_control_optimizer = new JSGUI3_HTML_Control_Optimizer({
+                package_name: control_elimination_config.package_name || 'jsgui3-html',
+                emit_manifest: control_elimination_config.emit_manifest === true,
+                allow_dynamic_controls: control_elimination_config.allow_dynamic_controls === true,
+                include_controls: control_elimination_config.include_controls,
+                exclude_controls: control_elimination_config.exclude_controls,
+                cacheEnabled: cache_config.enabled !== false,
+                sharedCache: cache_config.shared !== false,
+                log: control_elimination_config.log === true,
+                manifest_dir: control_elimination_config.manifest_dir,
+                shim_dir: control_elimination_config.shim_dir
+            });
+        } else {
+            this.jsgui3_html_control_optimizer = null;
+        }
+
+    }
 
     bundle(js_file_path) {
-        const {non_minifying_bundler, css_and_js_from_js_string_extractor, minifying_js_single_file_bundler, style_config} = this;
+        const {
+            non_minifying_bundler,
+            css_and_js_from_js_string_extractor,
+            minifying_js_single_file_bundler,
+            style_config,
+            jsgui3_html_control_optimizer
+        } = this;
 
         // Validate input
         if (typeof js_file_path !== 'string' || js_file_path.trim() === '') {
@@ -64,12 +131,27 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
 
-        const res_obs = obs(async(next, complete, error) => {
-
-            try {
-            //console.log('Advanced_JS_Bundler_Using_ESBuild bundle js_file_path:', js_file_path);
-
-            const res_nmb = await non_minifying_bundler.bundle(js_file_path);
+        const res_obs = obs(async(next, complete, error) => {
+
+            try {
+            //console.log('Advanced_JS_Bundler_Using_ESBuild bundle js_file_path:', js_file_path);
+
+            let entry_build_overrides = {};
+            let control_scan_manifest = null;
+
+            if (jsgui3_html_control_optimizer) {
+                const optimization_result = await jsgui3_html_control_optimizer.optimize(js_file_path);
+                if (optimization_result && optimization_result.enabled && optimization_result.plugin) {
+                    entry_build_overrides.plugins = [optimization_result.plugin];
+                }
+                if (optimization_result && optimization_result.manifest) {
+                    control_scan_manifest = optimization_result.manifest;
+                }
+            }
+
+            const res_nmb = await await_bundle_observable(
+                non_minifying_bundler.bundle(js_file_path, entry_build_overrides)
+            );
 
             //console.log('res_nmb', res_nmb);
 
@@ -103,7 +185,9 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
                             if (this.debug) {
                                 // Generate source maps for CSS-free JS
-                                const css_free_bundle_result = await non_minifying_bundler.bundle_js_string(js);
+                                const css_free_bundle_result = await await_bundle_observable(
+                                    non_minifying_bundler.bundle_js_string(js)
+                                );
                                 const css_free_bundle_item = css_free_bundle_result[0]._arr[0];
 
                                 const res_bundle = new Bundle();
@@ -118,9 +202,13 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                                     extension: 'css',
                                     text: compiled_css
                                 }
-                                res_bundle.push(o_css_bundle_item);
-                                next(res_bundle);
-                                complete(res_bundle);
+                                res_bundle.push(o_css_bundle_item);
+                                if (control_scan_manifest) {
+                                    res_bundle.bundle_analysis = res_bundle.bundle_analysis || {};
+                                    res_bundle.bundle_analysis.jsgui3_html_control_scan = control_scan_manifest;
+                                }
+                                next(res_bundle);
+                                complete(res_bundle);
 
 
 
@@ -130,9 +218,13 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
                             } else {
                                 // Generate source maps for CSS-free JS and minify
-                                const css_free_bundle_result = await non_minifying_bundler.bundle_js_string(js);
-                                const css_free_bundle_item = css_free_bundle_result[0]._arr[0];
-                                const minified_js = await minifying_js_single_file_bundler.bundle(css_free_bundle_item.text);
+                                const css_free_bundle_result = await await_bundle_observable(
+                                    non_minifying_bundler.bundle_js_string(js)
+                                );
+                                const css_free_bundle_item = css_free_bundle_result[0]._arr[0];
+                                const minified_js = await await_bundle_observable(
+                                    minifying_js_single_file_bundler.bundle(css_free_bundle_item.text)
+                                );
 
                                 //console.log('minified_js', minified_js);
                                 //console.log('minified_js.length', minified_js.length);
@@ -145,10 +237,14 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                                         type: 'CSS',
                                         extension: 'css',
                                         text: compiled_css
-                                    }
-                                    minified_bundle.push(o_css_bundle_item);
-                                    next(minified_bundle);
-                                    complete(minified_bundle);
+                                    }
+                                    minified_bundle.push(o_css_bundle_item);
+                                    if (control_scan_manifest) {
+                                        minified_bundle.bundle_analysis = minified_bundle.bundle_analysis || {};
+                                        minified_bundle.bundle_analysis.jsgui3_html_control_scan = control_scan_manifest;
+                                    }
+                                    next(minified_bundle);
+                                    complete(minified_bundle);
                                 } else {
                                     console.trace();
                                     throw 'Unexpected minified JS structure';

package/resources/processors/bundlers/js/esbuild/Core_JS_Non_Minifying_Bundler_Using_ESBuild.js

@@ -13,14 +13,15 @@ const Bundler_Using_ESBuild = require('./Bundler_Using_ESBuild');
 
 
 
-class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
-    constructor(spec = {}) {
-        super(spec);
+class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
+    constructor(spec = {}) {
+        super(spec);
 
         if (spec.debug !== undefined) this.debug = spec.debug;
 
-        // Store sourcemap configuration
-        this.sourcemap_config = spec.sourcemaps || {};
+        // Store sourcemap configuration
+        this.sourcemap_config = spec.sourcemaps || {};
+        this.build_plugins = Array.isArray(spec.plugins) ? spec.plugins : [];
 
     }
 
@@ -44,7 +45,7 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
 
 
 
-    bundle_js_string(js_string) {
+    bundle_js_string(js_string, build_overrides = {}) {
         const res_obs = obs(async(next, complete, error) => {
             try {
                 const o_build = {
@@ -63,6 +64,11 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
                     o_build.sourcemap = this.sourcemap_config.format || 'inline';
                 }
 
+                const plugins = Array.isArray(build_overrides.plugins) ? build_overrides.plugins : this.build_plugins;
+                if (plugins.length > 0) {
+                    o_build.plugins = plugins;
+                }
+
                 const result = await esbuild.build(o_build);
 
                 if (result.outputFiles.length === 1) {
@@ -87,7 +93,7 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
         return res_obs;
     }
 
-    bundle(js_file_path) {
+    bundle(js_file_path, build_overrides = {}) {
 
 
         const res_obs = obs(async(next, complete, error) => {
@@ -110,6 +116,11 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
                     o_build.sourcemap = this.sourcemap_config.format || 'inline';
                 }
 
+                const plugins = Array.isArray(build_overrides.plugins) ? build_overrides.plugins : this.build_plugins;
+                if (plugins.length > 0) {
+                    o_build.plugins = plugins;
+                }
+
                 const result = await esbuild.build(o_build);
             //console.log('result.outputFiles:\n\n');
             //for (let out of result.outputFiles) {