jsgui3-server 0.0.103 → 0.0.106

package/examples/controls/1) window/server.js

@@ -82,10 +82,10 @@ if (require.main === module) {
 
     const server = new Server({
         Ctrl: Demo_UI,
+        //debug: true,
         // Giving it the Ctrl and disk path client js should enable to server to get the JS-bundled CSS from the file(s).
         //  Putting the JS files through proper parsing and into a syntax tree would be best.
 
-
         //'js_mode': 'debug',
         'src_path_client_js': require.resolve('./client.js'),
         //debug: true // should not minify the js, should include the symbols.

package/examples/controls/3) five windows/server.js

@@ -92,7 +92,10 @@ if (require.main === module) {
 
     // then start the server....
     // be able to choose the port / ports?
-    console.log('waiting for server ready event');
+    //console.log('waiting for server ready event');
+
+    // 
+
     server.on('ready', () => {
         console.log('server ready');
 

package/examples/controls/4) window, tabbed panel/client.js

@@ -0,0 +1,208 @@
+const jsgui = require('jsgui3-client');
+const {controls, Control, mixins} = jsgui;
+const {dragable} = mixins;
+
+const Active_HTML_Document = require('../../../controls/Active_HTML_Document');
+
+// Maybe better to include it within an Active_HTML_Document.
+
+// Is currently a decent demo of a small active control running from the server, activated on the client.
+//   This square box is really simple, and it demonstrates the principle of the code for the draggable square box not being all that complex
+//   compared to a description of it.
+
+// A container with reorderable internal draggable items could help.
+
+// would be nice to be able to have all code in 1 file...???
+//  Though the sever code should be separate.
+
+
+// Relies on extracting CSS from JS files.
+// Usage of windows should be very easy on this level.
+
+
+class Demo_UI extends Active_HTML_Document {
+    constructor(spec = {}) {
+        spec.__type_name = spec.__type_name || 'demo_ui';
+        super(spec);
+        const {context} = this;
+
+        // Make sure it requires the correct CSS.
+        //  Though making that 'effortless' on the server may help more.
+
+
+        // Maybe can't do this here???
+
+        // Does not have .body (yet) on the client.
+        //   simple way to get the client to attach the body of the Active_HTML_Document?
+        //     maybe with jsgui-data-controls?
+        //   Though automatically having the .body property available on the client without sending extra HTTP
+        //     plumbing will help.
+
+        // .body will not be available before activation.
+
+
+        // .body should not be a normal function....?
+        //   a getter function would be better.
+
+
+
+        if (typeof this.body.add_class === 'function') {
+            this.body.add_class('demo-ui');
+        }
+
+        //console.log('this.body', this.body);
+        //console.log('this.body.add_class', this.body.add_class);
+
+
+        const compose = () => {
+            // put 20 of them in place.
+
+            // Then how to arrange them...?
+
+            const window = new controls.Window({
+                context: context,
+                title: 'jsgui3-html Window Control',
+                pos: [10, 10]
+            });
+
+            // Have Tab_Page items inside???
+
+            // Maybe need some more code to do with setting up the radio button group of tabs....
+
+            
+
+            const tabbed_panel = new controls.Tabbed_Panel({
+                context,
+
+                // Nice to be able to make it flexible in terms of taking string names for the tab specifications.
+
+
+
+                tabs: ['tab 1', 'tab 2']
+            });
+
+
+            window.inner.add(tabbed_panel);
+
+            this.body.add(window);
+
+
+
+            
+
+
+        }
+        if (!spec.el) {
+            compose();
+        }
+    }
+    activate() {
+        if (!this.__active) {
+            super.activate();
+            const {context} = this;
+
+            //console.log('activate Demo_UI');
+            // listen for the context events regarding frames, changes, resizing.
+
+            context.on('window-resize', e_resize => {
+                //console.log('window-resize', e_resize);
+
+                // Make all internal controls go absolute in terms of position
+                //   Remove them from their containers too?
+                //   Ie their containing divs?
+
+                // Would be nice to do this really simple with a fn call or very simple piece of code.
+                // Like get absolute position, set position to be absolute, move to that position.
+                // Maybe something within jsgui3-client helps with this, this is more about what needs to be done on the client.
+                //   Though recognising perf implications, it's (more) OK to include client-side functionality in jsgui3-html.
+
+
+
+
+
+
+            });
+
+        }
+    }
+}
+
+// Include this in bundling.
+//  Want CSS bundling so that styles are read out from the JS document and compiled to a stylesheet.
+
+//controls.Demo_UI = Demo_UI;
+
+// A css file may be an easier way to get started...?
+//  Want to support but not require css in js.
+
+// But need to set up the serving of the CSS both on the server, and on the client.
+//  Ofc setting it up on the server first is important - then can that stage set it up in the doc sent to the client?
+
+// Including the CSS from the JS like before.
+//  Needs to extract the CSS and serve it as a separate CSS file.
+//  Should also have end-to-end regression tests so this does not break again in the future.
+//   The code was kind of clunky and got refactored away.
+//   
+
+// Would need to parse the JS files to extract the CSS.
+//  Maybe could do it an easier way??? Now that it's easy, want a faster way.
+
+
+Demo_UI.css = `
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    overflow-x: hidden;
+    overflow-y: hidden;
+    background-color: #E0E0E0;
+}
+
+.demo-ui {
+    
+    /* 
+
+    display: flex;
+    flex-wrap: wrap;
+    
+    flex-direction: column; 
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    min-height: 100vh;
+    */
+    
+}
+`;
+
+// But may want to remove them from that flex upon picking up / dropping them.
+//  Maybe best upon drop.
+
+// Maybe want other examples that use absolute positioning to position the items at the start?
+// 
+
+
+
+//controls.Square_Box = Square_Box;
+// could export jsgui with the updated controls....
+//  so that they are in the correct Page Context.?
+
+
+controls.Demo_UI = Demo_UI;
+
+module.exports = jsgui;
+
+/*
+module.exports = {
+    Square_Box: Square_Box,
+    Demo_UI: Demo_UI
+}
+*/
+
+// Then if window...?
+
+// Need to add the Square_Box control to the context or original map of controls...
+

package/examples/controls/4) window, tabbed panel/server.js

@@ -0,0 +1,118 @@
+const jsgui = require('./client');
+
+const {Demo_UI} = jsgui.controls;
+const Server = require('../../../server');
+
+
+// what would be the (best?) way to include the whole thing in one JS file?
+//  Maybe don't try that right now.
+//  maybe standardise on the dir, then client.js and server.js inside.
+
+
+
+// Want to exclude this from the client bundle.
+//  Some kind of marking to say that it's server-side only?
+
+// Need to include JSGUI3 js within the client document.
+//   Seems like an earlier code simplification removed this functionality?
+//   Just specifying a Ctrl for the server - and giving it the 'disk_path_client_js'.
+//     May as well fix that....
+
+
+// The server code may be tiny, it seems best not to abstract it away totally though.
+// At least not for the moment.
+
+
+
+
+
+if (require.main === module) {
+
+    // By default should include the JS and the CSS.
+    // By reference, serving them from their respective paths.
+
+
+    // This API is not working right now.
+
+    // A very simple syntax for running a single control would be great.
+
+    // Need to in the default (server) configuration build and serve the client-side app.
+    // Want to be able to make interactive apps quickly with minimal server side code that needs to be written as boilerplate to
+    // get the app running.
+
+    // Though maybe defining a webpage, that serves the client js, and renders the control on the server, and activates it on the client,
+    // would be the right approach.
+
+    // Want to make the code really explicit, in a simple way.
+
+
+    // eg { '/': Demo_UI }
+    // eg { '*': Demo_UI }
+    //  as at least it explicitly assigns it to the '/' route
+
+
+    // But worth keeping the '/' Ctrl property?
+    //  Could change it to explicitly setting the route(s).
+
+    // Do want it to build the client js on start.
+
+    // Could extract the CSS from the file itself, or maybe better reading it from the classes and objects that are loaded / referenced.
+    // All kinds of complex server program structures exist already, so could use Publishers if needed for some things.
+    //  But need to keep the surface-level API really simple.
+
+    // Maybe define a Webpage and maybe use / define an HTML_Webpage_Publisher for example too.
+    // The clearest code would be really explicit about what it does, but in terms of almost English idioms
+    //  and on the surface-level not spelling out in great detail what it's doing, but referencing objects and
+    //  instructions with clear purposes, though details could be obscure at the top level. Eg it's the publisher's responsibility
+    //  to include the CSS and JS that's needed to get it to run. A publisher is referenced and used, and it does its thing.
+
+    // The Server could automatically involk the use of a Publisher.
+    //  May be better to either require or recommend more explicit code, have them in the examples,
+    //  but also to document some shortcuts, defaults, and abbreviations (though they may omit some essential info, so not recommended for beginners)
+
+    // Could have a tabbed view for examples for 'explicit' and 'short' notations when there are multiple.
+
+    // jsgui3-html-suite may be of use, for some more extended controls that are built on top of jsgui3-html, but not specifically
+    // client or server.
+
+
+
+
+
+
+    const server = new Server({
+        Ctrl: Demo_UI,
+        //debug: true,
+        // Giving it the Ctrl and disk path client js should enable to server to get the JS-bundled CSS from the file(s).
+        //  Putting the JS files through proper parsing and into a syntax tree would be best.
+
+        //'js_mode': 'debug',
+        'src_path_client_js': require.resolve('./client.js'),
+        //debug: true // should not minify the js, should include the symbols.
+        //js_client: require.resolve('./square_box.js')
+    });
+    // A callback or event for when the bundling has been completed
+    //  a 'ready' event.
+
+    // then start the server....
+    // be able to choose the port / ports?
+    console.log('waiting for server ready event');
+    server.on('ready', () => {
+        console.log('server ready');
+
+        // server start will change to observable?
+
+        server.start(8080, function (err, cb_start) {
+            if (err) {
+                throw err;
+            } else {
+                // Should have build it by now...
+    
+                console.log('server started');
+            }
+        });
+    })
+
+    
+
+}

package/package.json

@@ -11,13 +11,13 @@
     "browserify": "17.0.0",
     "child-process": "^1.0.2",
     "cookies": "^0.8.0",
-    "esbuild": "^0.19.4",
+    "esbuild": "^0.19.5",
     "fnl": "^0.0.29",
     "fnlfs": "^0.0.29",
-    "jsgui3-client": "^0.0.88",
+    "jsgui3-client": "^0.0.92",
     "jsgui3-webpage": "^0.0.6",
     "jsgui3-website": "^0.0.6",
-    "lang-tools": "^0.0.18",
+    "lang-tools": "^0.0.22",
     
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
@@ -45,5 +45,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.103"
+  "version": "0.0.106"
 }

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

@@ -599,6 +599,20 @@ const deep_iterate_babel_for_in_statement_node = (babel_node, depth, path, commo
 
 };
 
+const deep_iterate_babel_for_of_statement_node = (babel_node, depth, path, common, callback) => {
+    // value.raw is basically it.
+
+    const {left, right, body} = babel_node;
+    let sibling_number = 0;
+
+    deep_iterate_babel_node_$INTERNAL(left, depth + 1, path + sibling_number++ + '/', common, callback);
+    deep_iterate_babel_node_$INTERNAL(right, depth + 1, path + sibling_number++ + '/', common, callback);
+    deep_iterate_babel_node_$INTERNAL(body, depth + 1, path + sibling_number++ + '/', common, callback);
+
+};
+
+// deep_iterate_babel_for_of_statement_node
+
 // deep_iterate_babel_sequence_expression_node
 
 
@@ -771,6 +785,8 @@ const deep_iterate_babel_node_$INTERNAL = (babel_node, depth, path, common, call
                 return deep_iterate_babel_break_statement_node(babel_node, depth, path, common, callback);
             } else if (type === 'ForInStatement') {
                 return deep_iterate_babel_for_in_statement_node(babel_node, depth, path, common, callback);
+            } else if (type === 'ForOfStatement') {
+                return deep_iterate_babel_for_of_statement_node(babel_node, depth, path, common, callback);
             } else if (type === 'SequenceExpression') {
                 return deep_iterate_babel_sequence_expression_node(babel_node, depth, path, common, callback);
             } else if (type === 'ClassExpression') {
@@ -779,6 +795,9 @@ const deep_iterate_babel_node_$INTERNAL = (babel_node, depth, path, common, call
                 return deep_iterate_babel_rest_element_node(babel_node, depth, path, common, callback);
             } else if (type === 'AwaitExpression') {
                 return deep_iterate_babel_await_expression_node(babel_node, depth, path, common, callback);
+
+                // ForOfStatement
+
             } else {
 
                 // FunctionDeclaration TemplateLiteral TemplateElement TryStatement CatchClause