neo.mjs 9.9.0 → 9.10.1

package/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='9.9.0'
+         * @member {String} version='9.10.1'
          */
-        version: '9.9.0'
+        version: '9.10.1'
     }
 
     /**

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v9.9.0'
+                html  : 'v9.10.1'
             }]
         }],
         /**

package/buildScripts/buildESModules.mjs

@@ -2,17 +2,52 @@ import fs                   from 'fs-extra';
 import path                 from 'path';
 import {minify as minifyJs} from 'terser';
 import {minifyHtml}         from './util/minifyHtml.mjs';
-import {fileURLToPath}      from 'url';
 
 const
-    __filename       = fileURLToPath(import.meta.url),
-    __dirname        = path.dirname(__filename),
-    inputDirectories = ['apps', 'docs', 'examples', 'src'],
-    outputBasePath   = '../dist/esm/',
+    outputBasePath   = 'dist/esm/',
     // Regex to find import statements with 'node_modules' in the path
     // It captures the entire import statement (excluding the leading 'import') and the path itself.
-    regexImport      = /(import(?:["'\s]*(?:[\w*{}\n\r\t, ]+)from\s*)?)(["'`])((?:(?!\2).)*node_modules(?:(?!\2).)*)\2/g;
+    regexImport      = /(import(?:\s*(?:[\w*{}\n\r\t, ]+from\s*)?|\s*\(\s*)?)(["'`])((?:(?!\2).)*node_modules(?:(?!\2).)*)\2/g,
+    root             = path.resolve(),
+    requireJson      = path => JSON.parse(fs.readFileSync(path, 'utf-8')),
+    packageJson      = requireJson(path.join(root, 'package.json')),
+    insideNeo        = packageJson.name.includes('neo.mjs'),
+    startDate        = new Date();
+
+let inputDirectories;
+
+if (insideNeo) {
+    inputDirectories = ['apps', 'docs', 'examples', 'src']
+} else {
+    inputDirectories = ['apps', 'docs', 'node_modules/neo.mjs/src', 'src']
+}
+
+/**
+ * @param {String} match
+ * @param {String} p1 will be "import {marked}    from " (or similar, including the 'import' keyword and everything up to the first quote)
+ * @param {String} p2 will be the quote character (', ", or `)
+ * @param {String} p3 will be the original path string (e.g., '../../../../node_modules/marked/lib/marked.esm.js')
+ * @returns {String}
+ */
+function adjustImportPathHandler(match, p1, p2, p3) {
+    let newPath;
+
+    if (p3.includes('/node_modules/neo.mjs/')) {
+        newPath = p3.replace('/node_modules/neo.mjs/', '/')
+    } else {
+        newPath = '../../' + p3; // Prepend 2 levels up
+    }
+
+    // Reconstruct the import statement with the new path
+    return p1 + p2 + newPath + p2
+}
 
+/**
+ *
+ * @param {String} inputDir
+ * @param {String} outputDir
+ * @returns {Promise<void>}
+ */
 async function minifyDirectory(inputDir, outputDir) {
     if (fs.existsSync(inputDir)) {
         fs.mkdirSync(outputDir, {recursive: true});
@@ -20,6 +55,11 @@ async function minifyDirectory(inputDir, outputDir) {
         const dirents = fs.readdirSync(inputDir, {recursive: true, withFileTypes: true});
 
         for (const dirent of dirents) {
+            // Intended to skip the docs/output folder, since the content is already minified
+            if (dirent.path.includes('/docs/output/')) {
+                continue
+            }
+
             if (dirent.isFile()) {
                 const
                     inputPath    = path.join(dirent.path, dirent.name),
@@ -27,7 +67,7 @@ async function minifyDirectory(inputDir, outputDir) {
                     outputPath   = path.join(outputDir, relativePath),
                     content      = fs.readFileSync(inputPath, 'utf8');
 
-                await minifyFile(content, outputPath);
+                await minifyFile(content, outputPath)
             }
             // Copy resources folders
             else if (dirent.name === 'resources') {
@@ -50,7 +90,7 @@ async function minifyDirectory(inputDir, outputDir) {
                                 resourcePath = path.join(resource.path, resource.name),
                                 content      = fs.readFileSync(resourcePath, 'utf8');
 
-                            fs.writeFileSync(resourcePath, JSON.stringify(JSON.parse(content)));
+                            fs.writeFileSync(resourcePath, JSON.stringify(JSON.parse(content)))
                         }
                     }
                 }
@@ -59,6 +99,11 @@ async function minifyDirectory(inputDir, outputDir) {
     }
 }
 
+/**
+ * @param {String} content
+ * @param {String} outputPath
+ * @returns {Promise<void>}
+ */
 async function minifyFile(content, outputPath) {
     fs.mkdirSync(path.dirname(outputPath), {recursive: true});
 
@@ -71,32 +116,28 @@ async function minifyFile(content, outputPath) {
                 Object.assign(jsonContent, {
                     basePath      : '../../' + jsonContent.basePath,
                     environment   : 'dist/esm',
+                    mainPath      : './Main.mjs',
                     workerBasePath: jsonContent.basePath + 'src/worker/'
-                })
+                });
+
+                if (!insideNeo) {
+                    jsonContent.appPath = jsonContent.appPath.substring(6)
+                }
             }
 
             fs.writeFileSync(outputPath, JSON.stringify(jsonContent));
-            console.log(`Minified JSON: ${outputPath}`);
+            console.log(`Minified JSON: ${outputPath}`)
         }
         // Minify HTML files
         else if (outputPath.endsWith('.html')) {
             const minifiedContent = await minifyHtml(content);
 
             fs.writeFileSync(outputPath, minifiedContent);
-            console.log(`Minified HTML: ${outputPath}`);
+            console.log(`Minified HTML: ${outputPath}`)
         }
         // Minify JS files
         else if (outputPath.endsWith('.mjs')) {
-            let adjustedContent = content.replace(regexImport, (match, p1, p2, p3) => {
-                // p1 will be "import {marked}    from " (or similar, including the 'import' keyword and everything up to the first quote)
-                // p2 will be the quote character (', ", or `)
-                // p3 will be the original path string (e.g., '../../../../node_modules/marked/lib/marked.esm.js')
-
-                const newPath = '../../' + p3; // Prepend 2 levels up
-
-                // Reconstruct the import statement with the new path
-                return p1 + p2 + newPath + p2;
-            });
+            let adjustedContent = content.replace(regexImport, adjustImportPathHandler);
 
             const result = await minifyJs(adjustedContent, {
                 module: true,
@@ -109,28 +150,38 @@ async function minifyFile(content, outputPath) {
             });
 
             fs.writeFileSync(outputPath, result.code);
-            console.log(`Minified JS: ${outputPath}`);
+            console.log(`Minified JS: ${outputPath}`)
         }
     } catch (e) {
-        console.error(`Error minifying ${outputPath}:`, e);
+        console.error(`Error minifying ${outputPath}:`, e)
     }
 }
 
 const
-    swContent = fs.readFileSync(path.resolve(__dirname, '../ServiceWorker.mjs'), 'utf8'),
-    promises  = [minifyFile(swContent, path.resolve(__dirname, outputBasePath, 'ServiceWorker.mjs'))];
+    swContent = fs.readFileSync(path.resolve(root, 'ServiceWorker.mjs'), 'utf8'),
+    promises  = [minifyFile(swContent, path.resolve(root, outputBasePath, 'ServiceWorker.mjs'))];
 
 // Execute the minification
 inputDirectories.forEach(folder => {
-    promises.push(minifyDirectory(path.resolve(__dirname, '../' + folder), path.resolve(__dirname, outputBasePath, folder))
+    const outputPath = path.resolve(root, outputBasePath, folder.replace('node_modules/neo.mjs/', ''));
+
+    promises.push(minifyDirectory(path.resolve(root, folder), outputPath)
         .catch(err => {
             console.error('dist/esm Minification failed:', err);
             process.exit(1) // Exit with error code
         })
-    );
+    )
 });
 
 Promise.all(promises).then(() => {
-    console.log('dist/esm Minification complete.');
+    // Copying the already skipped and minified docs/output folder
+    const docsOutputPath = path.resolve(root, 'docs/output');
+
+    if (fs.existsSync(docsOutputPath)) {
+        fs.copySync(docsOutputPath, path.resolve(root, outputBasePath, 'docs/output'))
+    }
+
+    const processTime = (Math.round((new Date - startDate) * 100) / 100000).toFixed(2);
+    console.log(`\nTotal time for dist/esm: ${processTime}s`);
     process.exit()
-});
+})

package/buildScripts/webpack/buildThreads.mjs

@@ -26,7 +26,7 @@ program
     .option('-e, --env <value>',     '"all", "dev", "prod"')
     .option('-f, --framework')
     .option('-n, --noquestions')
-    .option('-t, --threads <value>', '"all", "app", "data", "main", "vdom"')
+    .option('-t, --threads <value>', '"all", "app", "canvas", "data", "main", "service", "task", "vdom"')
     .allowUnknownOption()
     .on('--help', () => {
         console.log('\nIn case you have any issues, please create a ticket here:');
@@ -61,7 +61,7 @@ if (programOpts.info) {
                 type   : 'list',
                 name   : 'threads',
                 message: 'Please choose the threads to build:',
-                choices: ['all', 'app', 'canvas', 'data', 'main', 'service', 'vdom'],
+                choices: ['all', 'app', 'canvas', 'data', 'main', 'service', 'task', 'vdom'],
                 default: 'all'
             });
         }
@@ -110,6 +110,10 @@ if (programOpts.info) {
                 childProcess = spawnSync(webpack, ['--config', `${tPath}.worker.mjs`, `--env insideNeo=${insideNeo} worker=service`], cpOpts);
                 childProcess.status && process.exit(childProcess.status);
             }
+            if (threads === 'all' || threads === 'task') {
+                childProcess = spawnSync(webpack, ['--config', `${tPath}.worker.mjs`, `--env insideNeo=${insideNeo} worker=task`], cpOpts);
+                childProcess.status && process.exit(childProcess.status);
+            }
             if (threads === 'all' || threads === 'vdom') {
                 childProcess = spawnSync(webpack, ['--config', `${tPath}.worker.mjs`, `--env insideNeo=${insideNeo} worker=vdom`], cpOpts);
                 childProcess.status && process.exit(childProcess.status);

package/buildScripts/webpack/json/build.json

@@ -1,25 +1,30 @@
 {
-    "mainInput": "./src/Main.mjs",
+    "mainInput" : "./src/Main.mjs",
     "mainOutput": "main.js",
+
     "workers": {
         "app": {
-            "input": "./src/worker/App.mjs",
+            "input" : "./src/worker/App.mjs",
             "output": "appworker.js"
         },
         "canvas": {
-            "input": "./src/worker/Canvas.mjs",
+            "input" : "./src/worker/Canvas.mjs",
             "output": "canvasworker.js"
         },
         "data": {
-            "input": "./src/worker/Data.mjs",
+            "input" : "./src/worker/Data.mjs",
             "output": "dataworker.js"
         },
         "service": {
-            "input": "./ServiceWorker.mjs",
+            "input" : "./ServiceWorker.mjs",
             "output": "serviceworker.js"
         },
+        "task": {
+            "input" : "./src/worker/Task.mjs",
+            "output": "taskworker.js"
+        },
         "vdom": {
-            "input": "./src/worker/VDom.mjs",
+            "input" : "./src/worker/VDom.mjs",
             "output": "vdomworker.js"
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name"           : "neo.mjs",
-    "version"        : "9.9.0",
+    "version"        : "9.10.1",
     "description"    : "The webworkers driven UI framework",
     "type"           : "module",
     "repository"     : {

package/src/DefaultConfig.mjs

@@ -264,12 +264,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '9.9.0'
+     * @default '9.10.1'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '9.9.0'
+    version: '9.10.1'
 };
 
 Object.assign(DefaultConfig, {

package/src/worker/Canvas.mjs

@@ -67,11 +67,14 @@ class Canvas extends Base {
     onRegisterNeoConfig(msg) {
         super.onRegisterNeoConfig(msg);
 
-        let path = Neo.config.appPath.slice(0, -8); // removing "/app.mjs"
+        let path = Neo.config.appPath;
+
+        if (path.endsWith('.mjs')) {
+            path = path.slice(0, -8); // removing "/app.mjs"
+        }
 
         import(
-            /* webpackInclude: /\/canvas.mjs$/ */
-            /* webpackExclude: /\/node_modules/ */
+            /* webpackExclude: /(?:\/|\\)(dist|node_modules)/ */
             /* webpackMode: "lazy" */
             `../../${path}/canvas.mjs`
         ).then(module => {

package/src/worker/Task.mjs

@@ -49,11 +49,14 @@ class Task extends Base {
     onRegisterNeoConfig(msg) {
         super.onRegisterNeoConfig(msg);
 
-        let path = Neo.config.appPath.slice(0, -8); // removing "/app.mjs"
+        let path = Neo.config.appPath;
+
+        if (path.endsWith('.mjs')) {
+            path = path.slice(0, -8); // removing "/app.mjs"
+        }
 
         import(
-            /* webpackInclude: /\/task.mjs$/ */
-            /* webpackExclude: /\/node_modules/ */
+            /* webpackExclude: /(?:\/|\\)(dist|node_modules)/ */
             /* webpackMode: "lazy" */
             `../../${path}/task.mjs`
         ).then(module => {