@tixyel/cli 2.5.0 → 2.6.1

package/dist/utils/watermark.d.ts

@@ -0,0 +1,7 @@
+import { WidgetInfo } from '../widget';
+export declare var logo: string;
+export declare const watermark: {
+    html(widget: WidgetInfo): string;
+    css(widget: WidgetInfo): string;
+    script(widget: WidgetInfo): string;
+};

package/dist/utils/watermark.js

@@ -0,0 +1,71 @@
+export var logo = `    ____    _     _                         _ 
+   / __ \\  | |_  (_) __  __  _   _    ___  | |
+  / / _\` | | __| | | \\ \\/ / | | | |  / _ \\ | |
+ | | (_| | | |_  | |  >  <  | |_| | |  __/ | |
+  \\ \\__,_|  \\__| |_| /_/\\_\\  \\__, |  \\___| |_|
+   \\____/                    |___/\n`;
+export const watermark = {
+    html(widget) {
+        return [
+            `<!---`,
+            logo,
+            `Generated by Tixyel Widgets SDK`,
+            `Widget name: ${widget.config.name}`,
+            `Version: ${widget.config.version}`,
+            `Description: ${widget.config.description}`,
+            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
+            `Made by: ${widget.config.metadata?.author}`,
+            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
+            ...Object.entries(widget.config.metadata || {})
+                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
+                .map(([key, value]) => `${key}: ${value}`),
+            ' ',
+            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
+            `--->`,
+        ]
+            .filter(Boolean)
+            .join('\n');
+    },
+    css(widget) {
+        return [
+            `/**`,
+            logo,
+            `Generated by Tixyel Widgets SDK`,
+            `Widget name: ${widget.config.name}`,
+            `Version: ${widget.config.version}`,
+            `Description: ${widget.config.description}`,
+            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
+            `Made by: ${widget.config.metadata?.author}`,
+            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
+            ...Object.entries(widget.config.metadata || {})
+                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
+                .map(([key, value]) => `${key}: ${value}`),
+            ' ',
+            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
+            `*/`,
+        ]
+            .filter(Boolean)
+            .join('\n');
+    },
+    script(widget) {
+        return [
+            `/**`,
+            logo,
+            `Generated by Tixyel Widgets SDK`,
+            `Widget name: ${widget.config.name}`,
+            `Version: ${widget.config.version}`,
+            `Description: ${widget.config.description}`,
+            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
+            `Made by: ${widget.config.metadata?.author}`,
+            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
+            ...Object.entries(widget.config.metadata || {})
+                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
+                .map(([key, value]) => `${key}: ${value}`),
+            ' ',
+            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
+            `*/`,
+        ]
+            .filter(Boolean)
+            .join('\n');
+    },
+};

package/dist/widget.js

@@ -15,6 +15,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 import JSZip from 'jszip';
 import { transformSync } from 'esbuild';
+import { watermark } from './utils/watermark';
 export async function createWidget(path, metadata, config, root) {
     try {
         console.log(`📁 Creating ${metadata?.name} at: ${path}`);
@@ -287,81 +288,26 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
         }
         return contents;
     };
-    // watermark for the files
-    var ref = `    ____    _     _                         _ 
-   / __ \\  | |_  (_) __  __  _   _    ___  | |
-  / / _\` | | __| | | \\ \\/ / | | | |  / _ \\ | |
- | | (_| | | |_  | |  >  <  | |_| | |  __/ | |
-  \\ \\__,_|  \\__| |_| /_/\\_\\  \\__, |  \\___| |_|
-   \\____/                    |___/\n`;
-    var watermark = {
-        html: [
-            `<!---`,
-            ref,
-            `Generated by Tixyel Widgets SDK`,
-            `Widget name: ${widget.config.name}`,
-            `Version: ${widget.config.version}`,
-            `Description: ${widget.config.description}`,
-            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
-            `Made by: ${widget.config.metadata?.author}`,
-            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
-            ...Object.entries(widget.config.metadata || {})
-                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
-                .map(([key, value]) => `${key}: ${value}`),
-            ' ',
-            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
-            `--->`,
-        ]
-            .filter(Boolean)
-            .join('\n'),
-        css: [
-            `/**`,
-            ref,
-            `Generated by Tixyel Widgets SDK`,
-            `Widget name: ${widget.config.name}`,
-            `Version: ${widget.config.version}`,
-            `Description: ${widget.config.description}`,
-            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
-            `Made by: ${widget.config.metadata?.author}`,
-            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
-            ...Object.entries(widget.config.metadata || {})
-                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
-                .map(([key, value]) => `${key}: ${value}`),
-            ' ',
-            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
-            `*/`,
-        ]
-            .filter(Boolean)
-            .join('\n'),
-        script: [
-            `/**`,
-            ref,
-            `Generated by Tixyel Widgets SDK`,
-            `Widget name: ${widget.config.name}`,
-            `Version: ${widget.config.version}`,
-            `Description: ${widget.config.description}`,
-            `Tags: ${widget.config.metadata?.tags?.join(', ')}`,
-            `Made by: ${widget.config.metadata?.author}`,
-            widget.config.metadata?.clientId ? `Made for: ${widget.config.metadata?.clientId}` : undefined,
-            ...Object.entries(widget.config.metadata || {})
-                .filter(([key]) => !['tags', 'author', 'clientId'].includes(key))
-                .map(([key, value]) => `${key}: ${value}`),
-            ' ',
-            'DO NOT EDIT, SHARE OR DISTRIBUTE THIS CODE WITHOUT PERMISSION FROM THE AUTHOR',
-            `*/`,
-        ]
-            .filter(Boolean)
-            .join('\n'),
-    };
+    const usedWatermarks = new Set();
     const results = Object.fromEntries(await Promise.all(Object.entries(findPatterns).map(async ([key, patterns]) => {
         let result = '';
         const list = normalizeList(patterns);
-        if (list.length === 0) {
+        if (!list.length)
             return [key, ''];
-        }
+        const check = (keys, formats) => {
+            !Array.isArray(keys) && (keys = [keys]);
+            !Array.isArray(formats) && (formats = [formats]);
+            return (
+            // check keys
+            keys.some((k) => key.toLowerCase() === k.toLowerCase()) ||
+                // check formats
+                list.some((p) => formats.some((f) => p.toLowerCase().endsWith(f.toLowerCase()))));
+        };
         // Process HTML
-        if (['html', 'HTML'].some((k) => key === k)) {
-            result += watermark.html + '\n';
+        if (check('html', '.html')) {
+            if (!usedWatermarks.has('html'))
+                result += watermark.html(widget) + '\n';
+            usedWatermarks.add('html');
             if (verbose)
                 console.log(`  - Processing HTML...`);
             const files = findAndRead(entryDir, list);
@@ -388,8 +334,10 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             const minified = await minifyHTML(mergedHTML, workspaceConfig.build?.obfuscation?.html);
             result += minified.trim();
         }
-        else if (['css', 'style', 'styles'].some((k) => key === k)) {
-            result += watermark.css + '\n';
+        else if (check(['css', 'style', 'styles'], '.css')) {
+            if (!usedWatermarks.has('css'))
+                result += watermark.css(widget) + '\n';
+            usedWatermarks.add('css');
             if (verbose)
                 console.log(`  - Processing CSS...`);
             const files = findAndRead(entryDir, list);
@@ -410,8 +358,10 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             result += mergedCSS.trim();
         }
-        else if (['script', 'js', 'javascript'].some((k) => key === k)) {
-            result += watermark.script + '\n';
+        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);
@@ -422,8 +372,10 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             result += mergedJS.trim();
         }
-        else if (['typescript', 'ts'].some((k) => key === k)) {
-            result += watermark.script + '\n';
+        else if (check(['typescript', 'ts'], '.ts')) {
+            if (!usedWatermarks.has('script'))
+                result += watermark.script(widget) + '\n';
+            usedWatermarks.add('script');
             if (verbose)
                 console.log(`  - Processing TypeScript...`);
             const files = findAndRead(entryDir, list);
@@ -446,7 +398,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             const obfuscated = JavaScriptObfuscator.obfuscate(mergedTS.trim(), workspaceConfig.build?.obfuscation?.javascript);
             result += obfuscated.getObfuscatedCode();
         }
-        else if (['fields', 'FIELDS', 'fielddata', 'fieldData'].some((k) => key === k)) {
+        else if (check(['fields', 'fielddata', 'fieldData', 'cf', 'customfields'], '.json')) {
             if (verbose)
                 console.log(`  - Processing Json...`);
             const files = findAndRead(entryDir, list);
@@ -455,10 +407,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
                 try {
                     const noComments = parse(content);
                     const parsed = JSON.parse(JSON.stringify(noComments));
-                    mergedFields = {
-                        ...mergedFields,
-                        ...parsed,
-                    };
+                    Object.assign(mergedFields, parsed);
                 }
                 catch (error) {
                     console.warn(`   ⚠️  Failed to parse fields JSON: ${error}`);
@@ -475,7 +424,19 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
         return [key, result];
     })));
     for await (const [filename, key] of Object.entries(resultMapping)) {
-        const content = results[key];
+        let content = '';
+        if (typeof key === 'string')
+            content = results[key];
+        else if (Array.isArray(key)) {
+            for await (const k of key) {
+                const part = results[k];
+                if (part) {
+                    content += '\n' + part;
+                    if (verbose)
+                        console.log(`   ✓ Merged part for: ${k}`);
+                }
+            }
+        }
         if (content) {
             const outPath = join(outDir, filename);
             writeFileSync(outPath, content, 'utf-8');
@@ -487,7 +448,19 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
     try {
         const zip = new JSZip();
         for await (const [filename, key] of Object.entries(compactedMapping)) {
-            const content = results[key];
+            let content = '';
+            if (typeof key === 'string')
+                content = results[key];
+            else if (Array.isArray(key)) {
+                for await (const k of key) {
+                    const part = results[k];
+                    if (part) {
+                        content += '\n' + part;
+                        if (verbose)
+                            console.log(`   ✓ Merged part for ZIP: ${k}`);
+                    }
+                }
+            }
             if (content) {
                 zip.file(filename, content);
                 if (verbose)

package/dist/workspace.d.ts

@@ -104,7 +104,7 @@ export interface WorkspaceConfig<Find extends BuildFindMap = BuildFindMap> {
     };
 }
 type BuildFindMap = Record<string, string[]>;
-type BuildResultMap<Find extends BuildFindMap> = Record<string, keyof Find>;
+type BuildResultMap<Find extends BuildFindMap> = Record<string, keyof Find | (keyof Find)[]>;
 export declare function defineWorkspaceConfig<const Find extends BuildFindMap>(config: WorkspaceConfig<Find>): WorkspaceConfig<Find>;
 export declare function resolveConfig(path: string): Promise<WorkspaceConfig>;
 export declare function findWorkspaceRoot(startPath?: string): Promise<string | null>;

package/package.json

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