@tixyel/cli 2.6.2 → 2.6.3

package/dist/widget.js

@@ -289,6 +289,13 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
         return contents;
     };
     const usedWatermarks = new Set();
+    /**
+     * Build results processing
+     * Find all files based on patterns and process them according to their type
+     * (html, css, script, fields)
+     * Group results based on resultMapping and compactedMapping
+     * Compact/minify where applicable
+     */
     const results = Object.fromEntries(await Promise.all(Object.entries(findPatterns).map(async ([key, patterns]) => {
         let result = '';
         const list = normalizeList(patterns);
@@ -303,13 +310,14 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                 // check formats
                 list.some((p) => formats.some((f) => p.toLowerCase().endsWith(f.toLowerCase()))));
         };
+        const processed = new Set();
         // Process HTML
         if (check('html', '.html')) {
             if (!usedWatermarks.has('html'))
                 result += watermark.html(widget) + '\n';
             usedWatermarks.add('html');
             if (verbose)
-                console.log(`  - Processing HTML...`);
+                console.log(`  - Processing HTML for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
             const files = findAndRead(entryDir, list);
             let mergedHTML = '';
             for await (const fileContent of files) {
@@ -333,13 +341,14 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             const minified = await minifyHTML(mergedHTML, workspaceConfig.build?.obfuscation?.html);
             result += minified.trim();
+            processed.add('html');
         }
-        else if (check(['css', 'style', 'styles'], '.css')) {
+        if (check(['css', 'style', 'styles'], '.css')) {
             if (!usedWatermarks.has('css'))
                 result += watermark.css(widget) + '\n';
             usedWatermarks.add('css');
             if (verbose)
-                console.log(`  - Processing CSS...`);
+                console.log(`  - Processing CSS for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
             const files = findAndRead(entryDir, list);
             let mergedCSS = '';
             for await (const content of files) {
@@ -356,28 +365,19 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                 const processed = await postcss(plugin).process(content, { from: undefined });
                 mergedCSS += processed.css + '\n';
             }
-            result += mergedCSS.trim();
-        }
-        else if (check(['script', 'js', 'javascript'], '.js')) {
-            if (!usedWatermarks.has('script'))
-                result += watermark.script(widget) + '\n';
-            usedWatermarks.add('script');
-            if (verbose)
-                console.log(`  - Processing JavaScript...`);
-            const files = findAndRead(entryDir, list);
-            let mergedJS = '';
-            for await (const content of files) {
-                const obfuscated = JavaScriptObfuscator.obfuscate(content, workspaceConfig.build?.obfuscation?.javascript);
-                mergedJS += obfuscated.getObfuscatedCode() + '\n';
+            if (processed.has('html')) {
+                result = result += `<style>${mergedCSS.trim()}</style>`;
             }
-            result += mergedJS.trim();
+            else
+                result += mergedCSS.trim();
+            processed.add('css');
         }
-        else if (check(['typescript', 'ts'], '.ts')) {
+        if (check(['typescript', 'ts'], '.ts')) {
             if (!usedWatermarks.has('script'))
                 result += watermark.script(widget) + '\n';
             usedWatermarks.add('script');
             if (verbose)
-                console.log(`  - Processing TypeScript...`);
+                console.log(`  - Processing TypeScript for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
             const files = findAndRead(entryDir, list);
             let mergedTS = '';
             for await (const content of files) {
@@ -396,11 +396,35 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             // Obfuscate the compiled JavaScript
             const obfuscated = JavaScriptObfuscator.obfuscate(mergedTS.trim(), workspaceConfig.build?.obfuscation?.javascript);
-            result += obfuscated.getObfuscatedCode();
+            if (processed.has('html')) {
+                result = result += `<script>${obfuscated.getObfuscatedCode()}</script>`;
+            }
+            else
+                result += obfuscated.getObfuscatedCode();
+            processed.add('typescript');
         }
-        else if (check(['fields', 'fielddata', 'fieldData', 'cf', 'customfields'], '.json')) {
+        if (check(['script', 'js', 'javascript'], '.js')) {
+            if (!usedWatermarks.has('script'))
+                result += watermark.script(widget) + '\n';
+            usedWatermarks.add('script');
+            if (verbose)
+                console.log(`  - Processing JavaScript for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
+            const files = findAndRead(entryDir, list);
+            let mergedJS = '';
+            for await (const content of files) {
+                const obfuscated = JavaScriptObfuscator.obfuscate(content, workspaceConfig.build?.obfuscation?.javascript);
+                mergedJS += obfuscated.getObfuscatedCode() + '\n';
+            }
+            if (processed.has('html')) {
+                result = result += `<script>${mergedJS.trim()}</script>`;
+            }
+            else
+                result += mergedJS.trim();
+            processed.add('script');
+        }
+        if (check(['fields', 'fielddata', 'fieldData', 'cf', 'customfields'], '.json')) {
             if (verbose)
-                console.log(`  - Processing Json...`);
+                console.log(`  - Processing JSON for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
             const files = findAndRead(entryDir, list);
             let mergedFields = {};
             for await (const content of files) {
@@ -414,15 +438,22 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                     throw error;
                 }
             }
-            result += JSON.stringify(mergedFields, null, 2);
+            if (!processed.size)
+                result += JSON.stringify(mergedFields, null, 2);
+            processed.add('fields');
         }
-        else {
+        if (!result.length) {
             if (verbose)
                 console.log(`  - Unknown build key: ${key}, the available keys are html, css, script and fields.`);
             result += '';
         }
         return [key, result];
     })));
+    if (verbose) {
+        console.log(`   - Build results:`, Object.keys(results)
+            .map((k) => `${k}: ${results[k].length} bytes`)
+            .join(', '));
+    }
     for await (const [filename, key] of Object.entries(resultMapping)) {
         let content = '';
         if (typeof key === 'string')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tixyel/cli",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "CLI tool for streamelements widgets",
   "keywords": [
     "cli",