jsgui3-server 0.0.83 → 0.0.84

package/bundler/css-bundler.js

@@ -0,0 +1,48 @@
+const Bundler = require('./bundler');
+const Bundle = require('./bundle');
+const {obs, prom_or_cb} = require('fnl');
+const {tof} = 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?
+
+// 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.
+
+
+
+
+
+
+
+class CSS_Bundler extends Bundler {
+    constructor(spec = {}) {
+        super(spec);
+    }
+}
+
+//CSS_Bundler.bundle_css = bundle_css;
+module.exports = CSS_Bundler;

package/bundler/js-bundler.js

@@ -23,6 +23,10 @@ const Stream = require('stream');
 
 // 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.
+
+
 
 
 
@@ -33,6 +37,8 @@ const bundle_js = (js_file_path, options = {}, callback) => {
 
     const res = obs((next, complete, error) => {
 
+
+
         let a = arguments;
         if (typeof a[2] === 'function') {
             callback = a[2];
@@ -52,6 +58,12 @@ const bundle_js = (js_file_path, options = {}, callback) => {
 
             let fileContents = await fnlfs.load(js_file_path);
 
+            // Could use the CSS bundler to scan_js_for_css
+            //  Seems as though it would be best as an observable.
+
+
+            // Could first get own system AST of the JS file.
+
             // Modify the original file contents so that only client-side parts appear?
             //  Could be done by programatically removing a whole code block, what to do if it is run on the server.
 
@@ -98,6 +110,10 @@ const bundle_js = (js_file_path, options = {}, callback) => {
             });
 
             // May be able to better put the bundle stream info into the observable results.
+            //  Browserify gets given the stream.
+
+            // Nice if this function could output a stream as well.
+
 
             let parts = await stream_to_array(b.bundle());
 

package/bundler/test_ast.js

@@ -0,0 +1,74 @@
+
+// Load in a JS file, such as square box client.
+// Look for the CSS.
+
+
+// Load a JS file into an OO structure
+// Short term goals:
+
+// Answering questions on the level of the file.
+// Questions that are useful for finding out how to link the js files together.
+//  Don't want each file to be given it's own scope - want them to share local variable references to the the necessary things.
+//   Then those variable names won't be reused in inner scopes unless their replacement there is fine (ie they are otherwise unused).
+
+// This will assemble somewhat detailed information about what happens inside a JavaScript file.
+//  The aim is to carry out and represent different kinds of analysis, but at the moment focusing of finding features.
+
+// Root features
+
+// Declaration features
+// Object features
+
+// Let's make it so that any node can be tagged as having / representing / being part of a feature of some kind.
+//  To begin with focus on what variables are being declared and used.
+
+// Will be great to load in a whole load of JSGUI projects in such a way that the system / platform understands the ordering and 
+// recomposes them into a flat system where many / all declarations are local rather than using any import
+
+// jsgui-lang
+// ----------
+
+// Recognise the basic / general signature of the full document.
+// Recognise that the declarations are all within the root
+// Recognise the exports object at the end exports an object that is composed from same-name references to items declared within lang-mini
+//  and only items declared within jsgui
+//  that it has no external references
+
+// JSGUI_JS_File?
+
+
+
+const JS_File = require('../resources/jsbuilder/JS_File/JS_File');
+//const JS_File_Comprehension = require('../JS_File_Comprehension');
+const path = require('path');
+const fs = require('fs');
+const {each} = require('lang-mini');
+
+const JS_AST_Node = require('../resources/jsbuilder/JS_AST_Node_Extended/JS_AST_Node_Extended');
+
+const test_js_file = () => {
+    const fnl_path = require.resolve('./../examples/square_box_client.js');
+    const file_path = fnl_path;
+    // path of lang mini...
+
+    // Write and test a simple and convenient way for analysing JS files and recompiling them.
+    // To start with, find the ways to arrange parts of the JS into 'platforms'.
+    // How to then build platforms into JS files.
+    //  Will be about closures and sequences.
+    //  A lot about unique naming, closures, and getting the sequence of definitions correct.
+    // ObjectPattern
+    const resolved_path = path.resolve(file_path);
+    //console.log('resolved_path', resolved_path);
+
+    const fstream = fs.createReadStream(resolved_path);
+
+    const jsf = JS_File.load_from_stream(fstream, file_path);
+    jsf.on('ready', () => {
+        const {js_ast_node_file} = jsf;
+        //const body_child_node_identifier_names = [];
+        //const map_bcnidns = {};
+    });
+
+}
+
+test_js_file();

package/bundler/webpage-bundler.js

@@ -68,7 +68,7 @@ const bundle_web_page = (webpage, options = {}) => {
             });
             complete(res);
 
-        } if (t_content === 'control') {
+        } else if (t_content === 'control') {
             //console.log ('content.context', content.context);
             //console.log('content', content);
 

package/package.json

@@ -4,8 +4,8 @@
   "license": "MIT",
   "dependencies": {
     "@babel/core": "^7.17.9",
-    "@babel/parser": "7.17.9",
     "@babel/generator": "^7.17.9",
+    "@babel/parser": "7.17.9",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-minify": "^0.5.1",
     "browserify": "17.0.0",
@@ -15,7 +15,6 @@
     "fnlfs": "^0.0.24",
     "jsgui3-client": "^0.0.67",
     "jsgui3-html": "0.0.95",
-    
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
     "obext": "0.0.23",
@@ -41,5 +40,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.83"
+  "version": "0.0.84"
 }

package/publishing/http-website-publisher.js

@@ -99,14 +99,14 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
                 obs_bundling.on('complete', res => {
                     //console.log('obs_bundling res', res);
                     const bundle = res;
-                    console.log('bundle._arr.length', bundle._arr.length);
-                    console.log('Object.keys(bundle)', Object.keys(bundle));
+                    //console.log('bundle._arr.length', bundle._arr.length);
+                    //console.log('Object.keys(bundle)', Object.keys(bundle));
 
                     if (bundle._arr.length === 1) {
                         // And check it's HTML inside...?
 
                         const bundled_item = bundle._arr[0];
-                        console.log('bundled_item', bundled_item);
+                        //console.log('bundled_item', bundled_item);
 
                         if (bundled_item['content-type']) {
                             const ct = bundled_item['content-type'];
@@ -145,7 +145,7 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
 
                         each(bundle, item => {
                             //console.log('item', item);
-                            console.log('item.path', item.path, item['content-type']);
+                            //console.log('item.path', item.path, item['content-type']);
 
                             if (item['content-type']) {
                                 const ct = item['content-type'];
@@ -185,13 +185,10 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
                 })
 
             }));
-
             //throw 'NYI';
         }
-
         if (website) {
             setup_website_publishing(website);
-
         }
 
         // Create a router for the website if it does not already have one.
@@ -200,7 +197,6 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
         // Do we already know all of the pages in the website?
         //  Maybe there are dynamic pages.
 
-
         // Probably best to come up with a bundle here, or at an early stage.
 
         // .prepare_bundle?
@@ -247,10 +243,6 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
 
         // Possibly the publisher has the router for the website.
 
-
-
-
-
         // May have bundle already prepared anyway.
         //  Possibly the Website or the Website_Resource could do the bundling / building.
         //  Could even bundle into a ZIP file :)

package/resources/jsbuilder/babel/deep_iterate/deep_iterate_babel.js

@@ -533,6 +533,9 @@ const deep_iterate_babel_node_$INTERNAL = (babel_node, depth, path, common, call
             } else if (type === 'Super') {
                 return deep_iterate_babel_super_node(babel_node, depth, path, common, callback);
             } else {
+
+                // Need to make this handle a template literal too.
+
                 console.log('');
                 console.log('type', type);
                 console.log('');

package/resources/jsbuilder/test/test_ast_node.js

@@ -9,7 +9,7 @@
 
 // Load a JS file into an OO structure
 
-const JS_File = require('..//JS_File/JS_File');
+const JS_File = require('../JS_File/JS_File');
 //const JS_File_Comprehension = require('../JS_File_Comprehension');
 const path = require('path');
 const fs = require('fs');

package/resources/jsbuilder/test/test_js_file.js

@@ -33,7 +33,7 @@
 
 
 
-const JS_File = require('..//JS_File/JS_File');
+const JS_File = require('../JS_File/JS_File');
 //const JS_File_Comprehension = require('../JS_File_Comprehension');
 const path = require('path');
 const fs = require('fs');
@@ -48,7 +48,7 @@ const test_js_file = () => {
     // stream the file in.
     const lm_path = '../../../../../tools/lang-mini/lang-mini.js'
     const lt_path = '../../../../../tools/lang-tools/lang.js'
-    const fnl_path = '../../../../../tools/fnl/fnl.js'
+    const fnl_path = require.resolve('fnl');
     const filecomp_path = '../JS_File_Comprehension.js';
     const jsfile_path = '../JS_File/JS_File.js';
     const jsbuilder_path = '../JS_Builder.js';

package/roadmap.md

@@ -38,6 +38,24 @@ A file manager interface would be cool.
 Maybe would need to use file system resource
 Could work on remote file system too.
 
+Or make clear this is the core of the server?
+jsgui3-server-core perhaps?
+
+A Default server? Could also include file management.
+
+
+jsgui3-website could be helpful
+a .deploy function
+possibly the website could be hosted over multiple different servers, deployment could work for that.
+The website would not only be within the server.
+
+Could have a deployment wizard.
+
+
+
+
+
+
 
 
 

package/server.js

@@ -433,6 +433,16 @@ JSGUI_Server.Page_Context = Server_Page_Context;
 JSGUI_Server.Server_Page_Context = Server_Page_Context;
 JSGUI_Server.Website_Resource = Website_Resource;
 
+// Maybe jsgui3-website should be its own module.
+//  Would (completely?) abstract away from the server.
+
+// And maybe jsgui3-webpage
+//  Could be integrated within jsgui3-server.
+
+
+
+
+
 module.exports = JSGUI_Server;
 
 if (require.main === module) {