jsgui3-server 0.0.121 → 0.0.122

package/resources/processors/bundlers/bundle.js

@@ -1,30 +1,30 @@
-// Could make this a Collection?
-
-// jsgui3-bundle possibly?
-//  Could save the whole thing as a ZIP file, or in-memory buffer in ZIP format?
-
-
-
-
-// Not so sure it's best as a collection...?
-//   Maybe it could work though.
-//   Simple collection code could be fine.
-
-
-
-
-// bundle.add(obj that is part of the bundle)
-
-
-
-
-
-const {Collection} = require('jsgui3-html');
-
-class Bundle extends Collection {
-    constructor(spec = {}) {
-        super(spec);
-    }
-}
-
+// Could make this a Collection?
+
+// jsgui3-bundle possibly?
+//  Could save the whole thing as a ZIP file, or in-memory buffer in ZIP format?
+
+
+
+
+// Not so sure it's best as a collection...?
+//   Maybe it could work though.
+//   Simple collection code could be fine.
+
+
+
+
+// bundle.add(obj that is part of the bundle)
+
+
+
+
+
+const {Collection} = require('jsgui3-html');
+
+class Bundle extends Collection {
+    constructor(spec = {}) {
+        super(spec);
+    }
+}
+
 module.exports = Bundle;

package/resources/processors/bundlers/bundler.js

@@ -1,24 +1,24 @@
-const {Evented_Class} = require('jsgui3-html');
-
-
-// Or just have the bundler itself raise events, no need exactly for an observable.
-
-class Bundler extends Evented_Class {
-    constructor(spec = {}) {
-        super(spec);
-    }
-
-    // API - bundle() obs / promise
-    // Obs would be best because of status / progress updates.
-
-    bundle(item) {
-        console.trace();
-        throw 'Need implementation of specific item bundling'
-    }
-
-
-
-
-}
-
+const {Evented_Class} = require('jsgui3-html');
+
+
+// Or just have the bundler itself raise events, no need exactly for an observable.
+
+class Bundler extends Evented_Class {
+    constructor(spec = {}) {
+        super(spec);
+    }
+
+    // API - bundle() obs / promise
+    // Obs would be best because of status / progress updates.
+
+    bundle(item) {
+        console.trace();
+        throw 'Need implementation of specific item bundling'
+    }
+
+
+
+
+}
+
 module.exports = Bundler;

package/resources/processors/bundlers/css-bundler.js

@@ -1,235 +1,235 @@
-const Bundler = require('./bundler');
-//const Bundle = require('./bundle');
-const {obs, prom_or_cb} = require('fnl');
-const {tof, each} = require('jsgui3-html');
-const fnlfs = require('fnlfs');
-//const browserify = require('browserify');
-//const babel = require('@babel/core');
-const stream_to_array = require('stream-to-array');
-const util = require('util');
-const Stream = require('stream');
-// Will put the JS together. Maybe images?
-const fs = require('fs');
-const path = require('path');
-
-const JS_AST_Node = require('../../jsbuilder/JS_AST/JS_AST_Node');
-
-// Will put the JS together. Maybe images?
-//  Get everything ready to serve.
-
-// Would need a JS file that contains refs to all of the components used.
-//  Examine what is in the website and what JS it needs.
-
-// Should be customisable which system gets used to make the bundle.
-//  eg babel or esbuild. Browserify still seems to work on code here at least, but esbuild seems better.
-
-// JS bundling will become a bit more advanced in this server. Similar principles.
-
-// JS_Bundler reporting css that gets found while bundling JS would make sense.
-
-// jsgui3-jsbuilder could be a separate project too.
-// or jsgui3-js-builder even.
-
-
-// bundle_css_from_js_file?
-// scan_js_file_for_css perhaps.
-// scan_js_for_css
-//  maybe scan an AST or AST stream as it's coming in.
-
-
-// Needs to be able to copy / access the basic.css from jsgui3-html.
-//  Maybe be able to find them on disk.
-
-// Streaming does seem like the best meachanism for loading data etc.
-
-
-const stream_html_basic_css = () => {
-    const css_file_path = path.join(path.dirname(require.resolve('jsgui3-html')), 'css', 'basic.css');
-    console.log('css_file_path', css_file_path);
-
-    const res_stream = fs.createReadStream(css_file_path);
-
-    return res_stream;
-
-}
-
-const bundle_css_from_js_str = (js_str, options = {}) => {
-
-    //console.log('js_str.length', js_str.length);
-    // Moving towards using observables as a matter of course for longer-running functions.
-
-    // Seems like this makes a settimeout as well???
-
-
-    // OK, but see about also getting the JS without the CSS parts.
-
-
-
-    return obs((next, complete, error) => {
-
-        //console.log('js_str.length', js_str.length);
-
-        // Returning a Bundle object when done could be best...?
-
-        const spec = {
-            source: js_str
-        };
-
-        // This part is kind-of slow.
-
-        console.log('pre create js ast node');
-        const js_ast_node = JS_AST_Node.from_spec(spec);
-        console.log('post create js ast node');
-
-        // Maybe a faster / different JS parser.
-        //  Or do it using regex / specialised algorithm of some sort.
-
-
-
-
-        //console.log('!!js_ast_node', !!js_ast_node);
-
-        //console.log('Object.keys(js_ast_node)', Object.keys(js_ast_node));
-
-        // count all
-
-        //console.log('js_ast_node.query("count all")', js_ast_node.query("count all"));
-
-        //console.log('js_ast_node.query.count.all.exe()', js_ast_node.query.count.all.exe());
-
-        // A filter iterate query....? filter_deep_iterate could work.
-        //  but we are looking specifically for 'ClassName.css'
-        //   .css property assignments.
-
-        const ae_nodes = [];
-
-
-        // Just assigning a template literal to .css?
-        const css_ae_nodes = [];
-
-        // How about removing those parts from the JS AST?
-
-
-
-        js_ast_node.deep_iterate(node => {
-
-            // Maybe this part is slow? Don't think so though.
-
-            //console.log('node', node);
-            //console.log('Object.keys(node)', Object.keys(node));
-            //console.log('node.type_signature', node.type_signature);
-            //console.log('node.signature', node.signature);
-            //console.log('node.type', node.type);
-            //console.log('node.abbreviated_type', node.abbreviated_type);
-
-            if (node.type === 'AssignmentExpression') {
-                //return true;
-                ae_nodes.push(node);
-                //console.log('node.source', node.source);
-                
-                //console.log('Object.keys(node)', Object.keys(node));
-
-                //console.log('node.child_nodes.length', node.child_nodes.length);
-
-                const [node_assigned_to, node_assigned] = node.child_nodes;
-                //console.log('node_assigned_to.source', node_assigned_to.source);
-                //console.log('node_assigned_to.type', node_assigned_to.type);
-                //console.log('node_assigned.type', node_assigned.type);
-
-                if (node_assigned.type === 'TemplateLiteral') {
-
-                    if (node_assigned_to.type === 'MemberExpression') {
-
-                        //console.log('node_assigned_to', node_assigned_to);
-
-                        // the last ID being .css?
-                        const last_me_child = node_assigned_to.child_nodes[node_assigned_to.child_nodes.length - 1];
-                        //console.log('last_me_child', last_me_child);
-                        //console.log('last_me_child.source', last_me_child.source);
-
-                        if (last_me_child.source === 'css') {
-                            css_ae_nodes.push(node);
-                        }
-
-
-
-                        // does it end '.css'?
-                        //  break it down further?
-
-                    }
-
-                    ///console.log('node.source', node.source);
-                    //throw 'stop';
-
-                }
-
-                //console.log('');
-                // look at the left part...
-            }
-
-            //throw 'stop';
-        });
-        //console.log('ae_nodes', ae_nodes);
-        //console.log('ae_nodes.length', ae_nodes.length);
-        //console.log('css_ae_nodes.length', css_ae_nodes.length);
-
-        const arr_css = [];
-
-        if (css_ae_nodes.length > 0) {
-            //console.log('css_ae_nodes', css_ae_nodes);
-
-            each(css_ae_nodes, css_ae_node => {
-                //console.log('css_ae_node.source', css_ae_node.source);
-                const tl = css_ae_node.child_nodes[1].child_nodes[0];
-                //console.log('tl', tl);
-                //console.log('tl.source', tl.source);
-                arr_css.push(tl.source);
-
-
-            })
-        }
-
-        if (arr_css.length > 0) {
-            const str_css = arr_css.join('\n');
-
-            complete(str_css);
-        } else {
-            complete();
-        }
-
-        
-        // Can then do query to get all .css properties that are string templates.
-        //  is it a property of a Class object?
-
-
-
-
-
-        // Need to get an AST from it....
-        //  Or could simply search (regex?) for .css = `...`?
-
-
-
-
-        // Go through each file? Just the first?
-
-        // Or should the whole bundled (browserified) JS be consulted?
-
-        const [stop, pause, resume] = [() => {}, () => {}, () => {}];
-        return [stop, pause, resume];
-
-    });
-
-}
-
-
-
-class CSS_Bundler extends Bundler {
-    constructor(spec = {}) {
-        super(spec);
-    }
-}
-
-CSS_Bundler.bundle_css_from_js_str = bundle_css_from_js_str;
-CSS_Bundler.stream_html_basic_css = stream_html_basic_css;
+const Bundler = require('./bundler');
+//const Bundle = require('./bundle');
+const {obs, prom_or_cb} = require('fnl');
+const {tof, each} = require('jsgui3-html');
+const fnlfs = require('fnlfs');
+//const browserify = require('browserify');
+//const babel = require('@babel/core');
+const stream_to_array = require('stream-to-array');
+const util = require('util');
+const Stream = require('stream');
+// Will put the JS together. Maybe images?
+const fs = require('fs');
+const path = require('path');
+
+const JS_AST_Node = require('../../jsbuilder/JS_AST/JS_AST_Node');
+
+// Will put the JS together. Maybe images?
+//  Get everything ready to serve.
+
+// Would need a JS file that contains refs to all of the components used.
+//  Examine what is in the website and what JS it needs.
+
+// Should be customisable which system gets used to make the bundle.
+//  eg babel or esbuild. Browserify still seems to work on code here at least, but esbuild seems better.
+
+// JS bundling will become a bit more advanced in this server. Similar principles.
+
+// JS_Bundler reporting css that gets found while bundling JS would make sense.
+
+// jsgui3-jsbuilder could be a separate project too.
+// or jsgui3-js-builder even.
+
+
+// bundle_css_from_js_file?
+// scan_js_file_for_css perhaps.
+// scan_js_for_css
+//  maybe scan an AST or AST stream as it's coming in.
+
+
+// Needs to be able to copy / access the basic.css from jsgui3-html.
+//  Maybe be able to find them on disk.
+
+// Streaming does seem like the best meachanism for loading data etc.
+
+
+const stream_html_basic_css = () => {
+    const css_file_path = path.join(path.dirname(require.resolve('jsgui3-html')), 'css', 'basic.css');
+    console.log('css_file_path', css_file_path);
+
+    const res_stream = fs.createReadStream(css_file_path);
+
+    return res_stream;
+
+}
+
+const bundle_css_from_js_str = (js_str, options = {}) => {
+
+    //console.log('js_str.length', js_str.length);
+    // Moving towards using observables as a matter of course for longer-running functions.
+
+    // Seems like this makes a settimeout as well???
+
+
+    // OK, but see about also getting the JS without the CSS parts.
+
+
+
+    return obs((next, complete, error) => {
+
+        //console.log('js_str.length', js_str.length);
+
+        // Returning a Bundle object when done could be best...?
+
+        const spec = {
+            source: js_str
+        };
+
+        // This part is kind-of slow.
+
+        console.log('pre create js ast node');
+        const js_ast_node = JS_AST_Node.from_spec(spec);
+        console.log('post create js ast node');
+
+        // Maybe a faster / different JS parser.
+        //  Or do it using regex / specialised algorithm of some sort.
+
+
+
+
+        //console.log('!!js_ast_node', !!js_ast_node);
+
+        //console.log('Object.keys(js_ast_node)', Object.keys(js_ast_node));
+
+        // count all
+
+        //console.log('js_ast_node.query("count all")', js_ast_node.query("count all"));
+
+        //console.log('js_ast_node.query.count.all.exe()', js_ast_node.query.count.all.exe());
+
+        // A filter iterate query....? filter_deep_iterate could work.
+        //  but we are looking specifically for 'ClassName.css'
+        //   .css property assignments.
+
+        const ae_nodes = [];
+
+
+        // Just assigning a template literal to .css?
+        const css_ae_nodes = [];
+
+        // How about removing those parts from the JS AST?
+
+
+
+        js_ast_node.deep_iterate(node => {
+
+            // Maybe this part is slow? Don't think so though.
+
+            //console.log('node', node);
+            //console.log('Object.keys(node)', Object.keys(node));
+            //console.log('node.type_signature', node.type_signature);
+            //console.log('node.signature', node.signature);
+            //console.log('node.type', node.type);
+            //console.log('node.abbreviated_type', node.abbreviated_type);
+
+            if (node.type === 'AssignmentExpression') {
+                //return true;
+                ae_nodes.push(node);
+                //console.log('node.source', node.source);
+                
+                //console.log('Object.keys(node)', Object.keys(node));
+
+                //console.log('node.child_nodes.length', node.child_nodes.length);
+
+                const [node_assigned_to, node_assigned] = node.child_nodes;
+                //console.log('node_assigned_to.source', node_assigned_to.source);
+                //console.log('node_assigned_to.type', node_assigned_to.type);
+                //console.log('node_assigned.type', node_assigned.type);
+
+                if (node_assigned.type === 'TemplateLiteral') {
+
+                    if (node_assigned_to.type === 'MemberExpression') {
+
+                        //console.log('node_assigned_to', node_assigned_to);
+
+                        // the last ID being .css?
+                        const last_me_child = node_assigned_to.child_nodes[node_assigned_to.child_nodes.length - 1];
+                        //console.log('last_me_child', last_me_child);
+                        //console.log('last_me_child.source', last_me_child.source);
+
+                        if (last_me_child.source === 'css') {
+                            css_ae_nodes.push(node);
+                        }
+
+
+
+                        // does it end '.css'?
+                        //  break it down further?
+
+                    }
+
+                    ///console.log('node.source', node.source);
+                    //throw 'stop';
+
+                }
+
+                //console.log('');
+                // look at the left part...
+            }
+
+            //throw 'stop';
+        });
+        //console.log('ae_nodes', ae_nodes);
+        //console.log('ae_nodes.length', ae_nodes.length);
+        //console.log('css_ae_nodes.length', css_ae_nodes.length);
+
+        const arr_css = [];
+
+        if (css_ae_nodes.length > 0) {
+            //console.log('css_ae_nodes', css_ae_nodes);
+
+            each(css_ae_nodes, css_ae_node => {
+                //console.log('css_ae_node.source', css_ae_node.source);
+                const tl = css_ae_node.child_nodes[1].child_nodes[0];
+                //console.log('tl', tl);
+                //console.log('tl.source', tl.source);
+                arr_css.push(tl.source);
+
+
+            })
+        }
+
+        if (arr_css.length > 0) {
+            const str_css = arr_css.join('\n');
+
+            complete(str_css);
+        } else {
+            complete();
+        }
+
+        
+        // Can then do query to get all .css properties that are string templates.
+        //  is it a property of a Class object?
+
+
+
+
+
+        // Need to get an AST from it....
+        //  Or could simply search (regex?) for .css = `...`?
+
+
+
+
+        // Go through each file? Just the first?
+
+        // Or should the whole bundled (browserified) JS be consulted?
+
+        const [stop, pause, resume] = [() => {}, () => {}, () => {}];
+        return [stop, pause, resume];
+
+    });
+
+}
+
+
+
+class CSS_Bundler extends Bundler {
+    constructor(spec = {}) {
+        super(spec);
+    }
+}
+
+CSS_Bundler.bundle_css_from_js_str = bundle_css_from_js_str;
+CSS_Bundler.stream_html_basic_css = stream_html_basic_css;
 module.exports = CSS_Bundler;