@tixyel/cli 2.6.3 → 2.6.5

package/dist/widget.js

@@ -278,17 +278,18 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
     // const results: Record<string, string> = {};
     const normalizeList = (value) => (Array.isArray(value) ? value.filter(Boolean) : []);
     const findAndRead = (baseDir, patterns) => {
-        const contents = [];
+        const contents = {};
         for (const pattern of patterns) {
             const fullPath = join(baseDir, pattern);
             if (existsSync(fullPath)) {
                 const content = readFileSync(fullPath, 'utf-8');
-                contents.push(content);
+                contents[pattern] = content;
             }
         }
         return contents;
     };
     const usedWatermarks = new Set();
+    const processedFile = new Set();
     /**
      * Build results processing
      * Find all files based on patterns and process them according to their type
@@ -298,7 +299,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
      */
     const results = Object.fromEntries(await Promise.all(Object.entries(findPatterns).map(async ([key, patterns]) => {
         let result = '';
-        const list = normalizeList(patterns);
+        let list = normalizeList(patterns.filter((p) => !processedFile.has(p)));
         if (!list.length)
             return [key, ''];
         const check = (keys, formats) => {
@@ -316,27 +317,17 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             if (!usedWatermarks.has('html'))
                 result += watermark.html(widget) + '\n';
             usedWatermarks.add('html');
+            const fileList = list.filter((e) => e.endsWith('.html') && !processedFile.has(e));
             if (verbose)
-                console.log(`  - Processing HTML for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
-            const files = findAndRead(entryDir, list);
+                console.log(`  - Processing HTML for ${widget.config.name} [${key}, ${fileList.join(', ')}]...`);
+            const files = findAndRead(entryDir, fileList);
             let mergedHTML = '';
-            for await (const fileContent of files) {
+            for await (const [pattern, fileContent] of Object.entries(files)) {
                 // Extract body content
                 const bodyMatch = fileContent.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
                 if (bodyMatch && bodyMatch[1]) {
                     mergedHTML += bodyMatch[1].trim() + '\n';
-                }
-                // Extract and inline styles
-                const styleMatches = fileContent.matchAll(/<style[^>]*>([\s\S]*?)<\/style>/gi);
-                for (const match of styleMatches) {
-                    mergedHTML += `<style>${match[1]}</style>\n`;
-                }
-                // Extract and inline <script> tags
-                const scriptMatches = fileContent.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/gi);
-                for (const match of scriptMatches) {
-                    if (match[1]) {
-                        mergedHTML += `<script>${match[1]}</script>\n`;
-                    }
+                    processedFile.add(pattern);
                 }
             }
             const minified = await minifyHTML(mergedHTML, workspaceConfig.build?.obfuscation?.html);
@@ -347,11 +338,12 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             if (!usedWatermarks.has('css'))
                 result += watermark.css(widget) + '\n';
             usedWatermarks.add('css');
+            const fileList = list.filter((e) => e.endsWith('.css') && !processedFile.has(e));
             if (verbose)
-                console.log(`  - Processing CSS for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
-            const files = findAndRead(entryDir, list);
+                console.log(`  - Processing CSS for ${widget.config.name} [${key}, ${fileList.join(', ')}]...`);
+            const files = findAndRead(entryDir, fileList);
             let mergedCSS = '';
-            for await (const content of files) {
+            for await (const [pattern, content] of Object.entries(files)) {
                 const plugin = [
                     autoprefixer({
                         overrideBrowserslist: ['Chrome 127'],
@@ -364,6 +356,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                 }
                 const processed = await postcss(plugin).process(content, { from: undefined });
                 mergedCSS += processed.css + '\n';
+                processedFile.add(pattern);
             }
             if (processed.has('html')) {
                 result = result += `<style>${mergedCSS.trim()}</style>`;
@@ -376,16 +369,17 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             if (!usedWatermarks.has('script'))
                 result += watermark.script(widget) + '\n';
             usedWatermarks.add('script');
+            const fileList = list.filter((e) => e.endsWith('.ts') && !processedFile.has(e));
             if (verbose)
-                console.log(`  - Processing TypeScript for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
-            const files = findAndRead(entryDir, list);
+                console.log(`  - Processing TypeScript for ${widget.config.name} [${key}, ${fileList.join(', ')}]...`);
+            const files = findAndRead(entryDir, fileList);
             let mergedTS = '';
-            for await (const content of files) {
+            for await (const [pattern, content] of Object.entries(files)) {
                 try {
                     const transpiled = transformSync(content, {
                         loader: 'ts',
                         target: 'es2021',
-                        format: 'iife',
+                        format: 'cjs',
                     });
                     mergedTS += transpiled.code + '\n';
                 }
@@ -393,6 +387,9 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                     console.warn(`   ⚠️  Failed to compile TypeScript: ${error}`);
                     throw error;
                 }
+                finally {
+                    processedFile.add(pattern);
+                }
             }
             // Obfuscate the compiled JavaScript
             const obfuscated = JavaScriptObfuscator.obfuscate(mergedTS.trim(), workspaceConfig.build?.obfuscation?.javascript);
@@ -407,13 +404,15 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             if (!usedWatermarks.has('script'))
                 result += watermark.script(widget) + '\n';
             usedWatermarks.add('script');
+            const fileList = list.filter((e) => e.endsWith('.js') && !processedFile.has(e));
             if (verbose)
-                console.log(`  - Processing JavaScript for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
-            const files = findAndRead(entryDir, list);
+                console.log(`  - Processing JavaScript for ${widget.config.name} [${key}, ${fileList.join(', ')}]...`);
+            const files = findAndRead(entryDir, fileList);
             let mergedJS = '';
-            for await (const content of files) {
+            for await (const [pattern, content] of Object.entries(files)) {
                 const obfuscated = JavaScriptObfuscator.obfuscate(content, workspaceConfig.build?.obfuscation?.javascript);
                 mergedJS += obfuscated.getObfuscatedCode() + '\n';
+                processedFile.add(pattern);
             }
             if (processed.has('html')) {
                 result = result += `<script>${mergedJS.trim()}</script>`;
@@ -423,11 +422,12 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             processed.add('script');
         }
         if (check(['fields', 'fielddata', 'fieldData', 'cf', 'customfields'], '.json')) {
+            const fileList = list.filter((e) => e.endsWith('.json') && !processedFile.has(e));
             if (verbose)
-                console.log(`  - Processing JSON for ${widget.config.name} [${key}, ${list.join(', ')}]...`);
-            const files = findAndRead(entryDir, list);
+                console.log(`  - Processing JSON for ${widget.config.name} [${key}, ${fileList.join(', ')}]...`);
+            const files = findAndRead(entryDir, fileList);
             let mergedFields = {};
-            for await (const content of files) {
+            for await (const [pattern, content] of Object.entries(files)) {
                 try {
                     const noComments = parse(content);
                     const parsed = JSON.parse(JSON.stringify(noComments));

package/dist/widget.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/widget.test.js

@@ -0,0 +1,14 @@
+import { describe, expect, it } from 'bun:test';
+import { transformSync } from 'esbuild';
+describe('Should parse typescript into javascript', () => {
+    const tsContent = `function wait(ms: number) { return new Promise((resolve) => setTimeout(resolve, ms));}`;
+    const transpiled = transformSync(tsContent, {
+        loader: 'ts',
+        target: 'es2021',
+        format: 'cjs',
+    });
+    it('should transpile TypeScript to JavaScript', () => {
+        expect(transpiled.code).toContain('function wait(ms) {');
+        expect(transpiled.code).toContain('return new Promise((resolve) => setTimeout(resolve, ms));');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tixyel/cli",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "CLI tool for streamelements widgets",
   "keywords": [
     "cli",
@@ -50,7 +50,8 @@
   "scripts": {
     "build": "cross-env TIXYEL_VERSION=$npm_package_version tsc",
     "dev": "cross-env TIXYEL_VERSION=$npm_package_version tsc --watch",
-    "check-types": "tsc --noEmit"
+    "check-types": "tsc --noEmit",
+    "test": "bun test"
   },
   "dependencies": {
     "autoprefixer": "^10.4.22",
@@ -72,6 +73,7 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
+    "@types/bun": "^1.3.5",
     "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/inquirer": "^9.0.9",