jsgui3-server 0.0.119 → 0.0.121

package/resources/jsbuilder/JS_AST/JS_AST_Node_4.1-Index.js

@@ -7,7 +7,7 @@
 // Indexing at every level looks like it would be useful.
 //  so in order to get the info about how the names relate to nodes we consult indexes.
 
-const { each } = require('lang-mini');
+const { each } = require('lang-tools');
 const JS_AST_Node_Basics_Callmap = require('./JS_AST_Node_3.6-Basics_Callmap');
 const JS_AST_Node_Indexes = require('./JS_AST_Node_4.0-Index_Indexes');
 

package/resources/jsbuilder/JS_AST/JS_AST_Node_8-Features.js

@@ -1,6 +1,6 @@
 //const babel_node_tools = require('../babel/babel_node_tools');
 
-//const { each } = require('lang-mini');
+//const { each } = require('lang-tools');
 const JS_AST_Node_Query = require('./JS_AST_Node_7-Query');
 
 

package/resources/jsbuilder/JS_AST/JS_AST_Node_Feature/JS_AST_Node_Feature_Declaration.js

@@ -1,7 +1,7 @@
 // When a declaration is treated as a feature, there is programming less specifically for it being a node.
 
 // Feature is an abstraction on top of JS_AST_Node.
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 const JS_AST_Node_Feature = require('./JS_AST_Node_Feature');
 

package/resources/jsbuilder/JS_AST/JS_AST_Node_Feature/JS_AST_Node_Feature_Declarator.js

@@ -1,7 +1,7 @@
 // When a declaration is treated as a feature, there is programming less specifically for it being a node.
 
 // Feature is an abstraction on top of JS_AST_Node.
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 const JS_AST_Node_Feature = require('./JS_AST_Node_Feature');
 

package/resources/jsbuilder/JS_AST/JS_AST_Node_Feature/JS_AST_Root_Node_Feature/JS_AST_Root_Node_Feature_Exported.js

@@ -1,5 +1,5 @@
 
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 //const find_object_keys = require('../../query/find_object_keys');
 

package/resources/jsbuilder/JS_AST/JS_AST_Node_Feature/JS_AST_Root_Node_Feature/JS_AST_Root_Node_Interpreted.js

@@ -4,7 +4,7 @@ const JS_AST_Node = require('../../JS_AST_Node');
 const JS_AST_Root_Node_Feature_Exports = require('./JS_AST_Root_Node_Feature_Exports');
 
 
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 // A map of named / relevant inner nodes could be a useful feature of the ast node overall.
 
 // or is it an index if it's mapping to an array?

package/resources/jsbuilder/JS_AST/JS_AST_Relationship_Node_To_Group.js

@@ -1,5 +1,5 @@
 // Change to Group_Relationship?
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 const JS_AST_Group_Shared = require('./JS_AST_Group_Shared');
 
 

package/resources/jsbuilder/JS_AST/query/enable_array_as_queryable.js

@@ -1,4 +1,4 @@
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 const create_query_execution_fn = (arr, words = []) => {
     //console.log('words', words);

package/resources/jsbuilder/JS_AST/query/find_object_keys.js

@@ -1,4 +1,4 @@
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 
 // Doesn't use the index - at least not yet.

package/resources/jsbuilder/JS_AST_Node_Extended/JS_AST_Node_Declaration.js

@@ -1,5 +1,5 @@
 //const JS_AST_Node = require('../JS_AST/JS_AST_Node');
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 const JS_AST_Node_Extended_Core = require('./JS_AST_Node_Extended_0-Core');
 
 class JS_AST_Node_Declaration extends JS_AST_Node_Extended_Core {

package/resources/jsbuilder/JS_Builder.js

@@ -1,4 +1,4 @@
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 // Macroscope
 class JS_Builder extends Evented_Class {
     constructor(spec) {

package/resources/jsbuilder/JS_File/JS_File_0-Core.js

@@ -1,4 +1,4 @@
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 const crypto = require('crypto');
 
 const whitespace_chars = {

package/resources/jsbuilder/JS_File/JS_File_2-Babel.js

@@ -1,5 +1,5 @@
 const JS_File_Early_Parse = require('./JS_File_1-Early_Parse');
-const {each, tof} = require('lang-mini');
+const {each, tof} = require('lang-tools');
 
 const parser = require('@babel/parser');
 

package/resources/jsbuilder/JS_File/JS_File_4-Query.js

@@ -1,4 +1,4 @@
-const {each, tof} = require('lang-mini');
+const {each, tof} = require('lang-tools');
 const JS_File_JS_AST_Node = require('./JS_File_3-JS_AST_Node');
 
 const JS_File_Import_References = require('./JS_File_Import_References');

package/resources/jsbuilder/JS_File/JS_File_4.1-Query_Features.js

@@ -1,4 +1,4 @@
-const {each, tof} = require('lang-mini');
+const {each, tof} = require('lang-tools');
 const JS_File_Query = require('./JS_File_4-Query');
 
 const JS_File_Import_References = require('./JS_File_Import_References');

package/resources/jsbuilder/JS_File/JS_File_5-Planning.js

@@ -1,6 +1,6 @@
 const JS_File_Query_Features = require('./JS_File_4.1-Query_Features.js');
 const Variable_Name_Provider = require('../Variable_Name_Provider');
-const { each } = require('lang-mini');
+const { each } = require('lang-tools');
 class JS_File_Planning extends JS_File_Query_Features {
     constructor(spec) {
         super(spec);

package/resources/jsbuilder/JS_File/JS_File_6-Changing.js

@@ -1,6 +1,6 @@
 const JS_File_Planning = require('./JS_File_5-Planning');
 const Variable_Name_Provider = require('../Variable_Name_Provider');
-const { each } = require('lang-mini');
+const { each } = require('lang-tools');
 
 const {transform} = require("@babel/core");
 // import { transform } from "@babel/core";

package/resources/jsbuilder/JS_File/JS_Files.js

@@ -1,4 +1,4 @@
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 
 class JS_Files extends Evented_Class {
     constructor(spec) {

package/resources/jsbuilder/Platform.js

@@ -1,6 +1,6 @@
 // Make a platform about providing variables.
 
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 const Declaration_Sequence = require('./Abstract_Single_Declaration_Sequence');
 
 class Platform extends Evented_Class {

package/resources/jsbuilder/Platforms.js

@@ -3,7 +3,7 @@
 
 
 // Acts as an array / collection of platforms. Will use enumerator.
-const {tof, each, Evented_Class} = require('lang-mini');
+const {tof, each, Evented_Class} = require('lang-tools');
 
 // A platform can require a variety of other platforms under it.
 

package/resources/jsbuilder/Project.js

@@ -8,7 +8,7 @@
 //   Could load a whole load of them / category.
 //   Or 
 
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 
 //const JS_File = require('./JS_File_Core');
 const Platforms = require('./Platforms');

package/resources/jsbuilder/Scope.js

@@ -1,4 +1,4 @@
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 const Declaration_Sequence = require('./Abstract_Single_Declaration_Sequence');
 
 class Scope extends Evented_Class {

package/resources/jsbuilder/_JS_File.js

@@ -2,7 +2,7 @@
 
 // Want to write out jsgui in such a way that the lower levels are all accessed as local functions and objects within an inner scope.
 
-const {each, Evented_Class} = require('lang-mini');
+const {each, Evented_Class} = require('lang-tools');
 //const { default: JS_Builder } = require('./JS_Builder');
 
 // Interpret / arrange a file in terms of the other objects within this system.

package/resources/jsbuilder/babel/babel_node_tools.js

@@ -1,5 +1,5 @@
 //const { resolvePlugin } = require('@babel/core');
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 const deep_iterate_babel_node = require('./deep_iterate/deep_iterate_babel');
 

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

@@ -8,7 +8,7 @@
 
 
 
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 //const babel_node_tools = require('../babel_node_tools');
 
 
@@ -475,7 +475,11 @@ const deep_iterate_babel_template_literal_node = (babel_node, depth, path, commo
 
 
     if (expressions.length > 0) {
-        throw 'NYI';
+        // Array of nodes....
+
+        //console.log('babel_node', babel_node);
+        //throw 'NYI';
+        each(expressions, x => deep_iterate_babel_node_$INTERNAL(x, depth + 1, path + sibling_number++ + '/', common, callback));
     }
 
     if (quasis.length > 0) {

package/resources/jsbuilder/test/test_ast_node.js

@@ -14,7 +14,7 @@ const JS_File = require('../JS_File/JS_File');
 const path = require('path');
 const fs = require('fs');
 const Project = require('../Project');
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 //const JS_AST_Node = require('../JS_AST/JS_AST_Node');
 const JS_AST_Node = require('../JS_AST_Node_Extended/JS_AST_Node_Extended');

package/resources/jsbuilder/test/test_js_file.js

@@ -38,7 +38,7 @@ const JS_File = require('../JS_File/JS_File');
 const path = require('path');
 const fs = require('fs');
 const Project = require('../Project');
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 
 const JS_AST_Node = require('../JS_AST_Node_Extended/JS_AST_Node_Extended');
 
@@ -217,7 +217,7 @@ const test_js_file = () => {
                                 //console.log('node.source', node.source);
 
                             if (node.signature === 'VDn(VDr(ID,CE(ID,SL)))') {
-                                // var lang_mini = require('lang-mini');
+                                // var lang_mini = require('lang-tools');
 
                                 // could spot that it's a require call here.
                                 //  basically this code is going to be re-worked in some ways to make use of improved queries.

package/resources/jsbuilder/test/test_project.js

@@ -20,7 +20,7 @@ const test_lang_mini_project = () => {
     const path = require('path');
     const fs = require('fs');
     const Project = require('../Project');
-    const {each} = require('lang-mini');
+    const {each} = require('lang-tools');
 
     const JS_AST_Node = require('../JS_AST_Node_Extended/JS_AST_Node_Extended');
 

package/resources/process-js.js

@@ -12,7 +12,7 @@
 
 
 
-const {each} = require('lang-mini');
+const {each} = require('lang-tools');
 // Strings of js?
 //  Array of lines?
 

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

@@ -25,13 +25,20 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
         //this.css_extractor = new CSS_Extractor();
 
+        // A Debug Bundler would help.
+        //   Need to make it keep the CSS in the js.
+
+
 
         this.non_minifying_bundler = new Core_JS_Non_Minifying_Bundler_Using_ESBuild({
             debug: this.debug
         });
 
-
-        this.css_and_js_from_js_string_extractor = new CSS_And_JS_From_JS_String_Extractor();
+        // a keep_css_in_js option too....
+        //  and a 'debug' property, so it keeps the css in the js...?
+        this.css_and_js_from_js_string_extractor = new CSS_And_JS_From_JS_String_Extractor({
+            debug: this.debug
+        });
 
 
         // Probably don't use that minifying bundler in debug mode.
@@ -131,12 +138,8 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                                         // Should put it all in a single res bundle though....
                                         //   Though merging / concating bundles will be fine too.
 
-
-
                                         const minified_js_bundle_collection = minified_js[0];
 
-                                        
-
                                         const o_css_bundle_item = {
                                             type: 'CSS',
                                             extension: 'css',

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

@@ -61,13 +61,14 @@ class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_
                     //loader: 'ts',
                 },
                 //bundle: true,
+                target: 'es2022',
                 
                 // Possibly no minification here....
                 // Want to use non-minified or only partially minified version to separate the JS and the CSS.
 
                 treeShaking: true,
                 minify: true,
-                //format: 'iife',
+                format: 'cjs',
 
                 //sourcemap: 'external',
                 write: false,

package/resources/processors/bundlers/test_ast.js

@@ -42,7 +42,7 @@ 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 {each} = require('lang-tools');
 
 const JS_AST_Node = require('../resources/jsbuilder/JS_AST_Node_Extended/JS_AST_Node_Extended');
 

package/resources/processors/extractors/Extractor.js

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

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

@@ -35,6 +35,10 @@ const Pos_Span_String_Extractor = require('../../../string/Pos_Span_String_Extra
 
 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();
@@ -183,11 +187,22 @@ class CSS_And_JS_From_JS_String_Using_AST_Node_Extractor extends Extractor {
                 // object with keys may be easier / better / simpler.
                 //  or even a Bundle object?
 
-                const res = {
-                    css: str_css,
-                    js: str_js_without_css_assignments
+                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);
                 }
 
+                
+
 
 
 
@@ -197,7 +212,7 @@ class CSS_And_JS_From_JS_String_Using_AST_Node_Extractor extends Extractor {
 
 
 
-                complete(res);
+                
             } else {
                 complete();
             }