jsgui3-server 0.0.121 → 0.0.122

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

@@ -1,23 +1,23 @@
-const Bundler = require('./bundler');
-const Bundle = require('./bundle');
-const {obs} = require('fnl');
-const {tof} = require('jsgui3-html');
-
-//  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.
-
-// Bundling up the contents of a small/medium website so that contents are compressed and ready to serve.
-// Could be useful for deploying to Android / iOS devices, maybe as apps.
-
-
-
-class Website_Bundler extends Bundler {
-    constructor(spec = {}) {
-        super(spec);
-    }
-}
-
-
+const Bundler = require('./bundler');
+const Bundle = require('./bundle');
+const {obs} = require('fnl');
+const {tof} = require('jsgui3-html');
+
+//  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.
+
+// Bundling up the contents of a small/medium website so that contents are compressed and ready to serve.
+// Could be useful for deploying to Android / iOS devices, maybe as apps.
+
+
+
+class Website_Bundler extends Bundler {
+    constructor(spec = {}) {
+        super(spec);
+    }
+}
+
+
 module.exports = Website_Bundler;

package/resources/processors/extractors/Extractor.js

@@ -1,12 +1,10 @@
-
-const {Evented_Class} = require('lang-tools');
-
-class Extractor extends Evented_Class {
-    constructor(spec = {}) {
-        super();
-
-        if (spec.debug !== undefined) this.debug = spec.debug;
-    }
-}
-
+
+const {Evented_Class} = require('lang-tools');
+
+class Extractor extends Evented_Class {
+    constructor(spec) {
+        super();
+    }
+}
+
 module.exports = Extractor;

package/resources/processors/extractors/js/css_and_js/AST_Node/CSS_And_JS_From_JS_String_Using_AST_Node_Extractor.js

@@ -1,255 +1,240 @@
-
-
-// Extract the CSS and JS from JS, using AST_Node.
-//   AST_Node is part of jsgui3-server, possibly too slow though.
-
-const {obs, prom_or_cb} = require('fnl');
-const {tof, each} = require('jsgui3-html');
-
-
-const JS_AST_Node = require('../../../../../jsbuilder/JS_AST/JS_AST_Node');
-const Extractor = require('../../../Extractor');
-
-const Pos_Span_String_Extractor = require('../../../string/Pos_Span_String_Extractor');
-
-// Seems like a really specific and JS-AST aware algorithm.
-//   The JS AST parsing (single thread JS, maybe inefficient class structure) is relatively slow, but much faster than Babel compilation
-//   was / is.
-
-// const String_Pos_Spans_Remover = ....
-
-// Really specifically named and categorised classes will be a main feature of this part of the (Server) architecture.
-
-
-
-
-
-
-// But also being able to recreate the AST without the CSS will help.
-
-// This extraction extracts parts from the JS file that directly are CSS.
-//   I don't think at the moment it does anything further than that - though want it to remove all the declarations of CSS
-//   from the JS and return that JS.
-
-// See about removing the nodes from the tree....
-
-class CSS_And_JS_From_JS_String_Using_AST_Node_Extractor extends Extractor {
-    constructor(spec) {
-
-        // and a 'debug' property...?
-        //   in which case it keeps the css in the js - but extracts it to its own css though.
-
-        super(spec);
-
-        this.pos_span_string_extractor = new Pos_Span_String_Extractor();
-    }
-
-    extract(str_js) {
-        const {pos_span_string_extractor} = this;
-
-        const js_str = str_js;
-        return obs((next, complete, error) => {
-            const spec = {
-                source: js_str
-            };
-
-            // This part is kind-of slow.
-
-            //console.log('pre create js ast node');
-            console.log('Separating CSS and JS');
-            const js_ast_node = JS_AST_Node.from_spec(spec);
-            //console.log('post create js ast node');
-            
-            //const ae_nodes = [];
-
-            const arr_pos_spans_css_js_nodes = [];  // will remove them from the JS that's built / published.
-
-
-
-
-            // 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 => {
-
-                const {start, end} = node.babel;
-
-                // 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.babel)', Object.keys(node.babel));
-
-                    //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);
-
-                                //console.log('[start, end]', [start, end]);
-                                //console.log('node.source:\n' + node.source + '\n');
-
-                                arr_pos_spans_css_js_nodes.push([start, end]);
-
-                            }
-
-                            // 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) {
-
-
-                // Needs to also return the JS, without the CSS.
-
-
-
-
-                const str_css = arr_css.join('\n');
-
-                //console.log('arr_pos_spans_css_js_nodes', arr_pos_spans_css_js_nodes);
-
-                // Then see about removing the inverse of them from the original string.
-
-                const str_js_without_css_assignments = pos_span_string_extractor.extract(js_str, arr_pos_spans_css_js_nodes, {invert: true});
-
-
-                //console.log('str_js_without_css_assignments', str_js_without_css_assignments);
-                //console.log('str_js_without_css_assignments.length', str_js_without_css_assignments.length);
-
-
-                // return an array perhaps?
-                // object with keys may be easier / better / simpler.
-                //  or even a Bundle object?
-
-                if (this.debug === true) {
-                    const res = {
-                        css: str_css,
-                        js: str_js
-                    }
-                    complete(res);
-                } else {
-                    const res = {
-                        css: str_css,
-                        js: str_js_without_css_assignments
-                    }
-                    complete(res);
-                }
-
-                
-
-
-
-
-                //console.trace();
-                //throw 'stop';
-
-
-
-
-                
-            } 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];
-
-        });
-
-    }
-
-    // Then extract by giving it a JS string?
-    // A file path???
-
-
-
-
-
-
-}
-
+
+
+// Extract the CSS and JS from JS, using AST_Node.
+//   AST_Node is part of jsgui3-server, possibly too slow though.
+
+const {obs, prom_or_cb} = require('fnl');
+const {tof, each} = require('jsgui3-html');
+
+
+const JS_AST_Node = require('../../../../../jsbuilder/JS_AST/JS_AST_Node');
+const Extractor = require('../../../Extractor');
+
+const Pos_Span_String_Extractor = require('../../../string/Pos_Span_String_Extractor');
+
+// Seems like a really specific and JS-AST aware algorithm.
+//   The JS AST parsing (single thread JS, maybe inefficient class structure) is relatively slow, but much faster than Babel compilation
+//   was / is.
+
+// const String_Pos_Spans_Remover = ....
+
+// Really specifically named and categorised classes will be a main feature of this part of the (Server) architecture.
+
+
+
+
+
+
+// But also being able to recreate the AST without the CSS will help.
+
+// This extraction extracts parts from the JS file that directly are CSS.
+//   I don't think at the moment it does anything further than that - though want it to remove all the declarations of CSS
+//   from the JS and return that JS.
+
+// See about removing the nodes from the tree....
+
+class CSS_And_JS_From_JS_String_Using_AST_Node_Extractor extends Extractor {
+    constructor(spec) {
+        super(spec);
+
+        this.pos_span_string_extractor = new Pos_Span_String_Extractor();
+    }
+
+    extract(str_js) {
+        const {pos_span_string_extractor} = this;
+
+        const js_str = str_js;
+        return obs((next, complete, error) => {
+            const spec = {
+                source: js_str
+            };
+
+            // This part is kind-of slow.
+
+            //console.log('pre create js ast node');
+            console.log('Separating CSS and JS');
+            const js_ast_node = JS_AST_Node.from_spec(spec);
+            //console.log('post create js ast node');
+            
+            //const ae_nodes = [];
+
+            const arr_pos_spans_css_js_nodes = [];  // will remove them from the JS that's built / published.
+
+
+
+
+            // 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 => {
+
+                const {start, end} = node.babel;
+
+                // 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.babel)', Object.keys(node.babel));
+
+                    //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);
+
+                                //console.log('[start, end]', [start, end]);
+                                //console.log('node.source:\n' + node.source + '\n');
+
+                                arr_pos_spans_css_js_nodes.push([start, end]);
+
+                            }
+
+                            // 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) {
+
+
+                // Needs to also return the JS, without the CSS.
+
+
+
+
+                const str_css = arr_css.join('\n');
+
+                //console.log('arr_pos_spans_css_js_nodes', arr_pos_spans_css_js_nodes);
+
+                // Then see about removing the inverse of them from the original string.
+
+                const str_js_without_css_assignments = pos_span_string_extractor.extract(js_str, arr_pos_spans_css_js_nodes, {invert: true});
+
+
+                //console.log('str_js_without_css_assignments', str_js_without_css_assignments);
+                //console.log('str_js_without_css_assignments.length', str_js_without_css_assignments.length);
+
+
+                // return an array perhaps?
+                // object with keys may be easier / better / simpler.
+                //  or even a Bundle object?
+
+                const res = {
+                    css: str_css,
+                    js: str_js_without_css_assignments
+                }
+
+
+
+
+                //console.trace();
+                //throw 'stop';
+
+
+
+
+                complete(res);
+            } 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];
+
+        });
+
+    }
+
+    // Then extract by giving it a JS string?
+    // A file path???
+
+
+
+
+
+
+}
+
 module.exports = CSS_And_JS_From_JS_String_Using_AST_Node_Extractor;

package/resources/processors/extractors/js/css_and_js/CSS_And_JS_From_JS_String_Extractor.js

@@ -1,4 +1,4 @@
-const CSS_And_JS_From_JS_String_Using_AST_Node_Extractor = require('./AST_Node/CSS_And_JS_From_JS_String_Using_AST_Node_Extractor');
-
-
+const CSS_And_JS_From_JS_String_Using_AST_Node_Extractor = require('./AST_Node/CSS_And_JS_From_JS_String_Using_AST_Node_Extractor');
+
+
 module.exports = CSS_And_JS_From_JS_String_Using_AST_Node_Extractor;