@fluffjs/cli 0.1.14 → 0.1.15

package/Cli.d.ts

@@ -22,7 +22,12 @@ export declare class Cli {
     private buildTarget;
     private serve;
     private serveTarget;
-    private generateEntryPoint;
+    private resolveEntryPoint;
+    private getEsbuildEntryConfig;
+    private getJsBundleName;
+    private collectStyles;
+    private loadTsConfig;
+    private generateEntryContent;
     private findAllTsFiles;
     private findFiles;
     private matchesPatterns;

package/Cli.js

@@ -302,49 +302,16 @@ Examples:
         if (this.noMinify) {
             bundleOptions.minify = false;
         }
-        const entryPoint = target.entryPoint
-            ? path.join(srcDir, target.entryPoint)
-            : this.generateEntryPoint(srcDir, target.exclude);
-        let inlineStyles = '';
-        if (target.styles && target.styles.length > 0) {
-            const styleContents = [];
-            for (const stylePath of target.styles) {
-                const fullPath = path.resolve(srcDir, stylePath);
-                if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile()) {
-                    console.log(`   ✓ Style: ${stylePath}`);
-                    styleContents.push(fs.readFileSync(fullPath, 'utf-8'));
-                }
-                else {
-                    const styleFiles = this.findFiles(srcDir, [stylePath]);
-                    if (styleFiles.length === 0) {
-                        console.warn(`   ⚠ Style not found: ${fullPath}`);
-                    }
-                    for (const styleFile of styleFiles) {
-                        console.log(`   ✓ Style: ${path.relative(srcDir, styleFile)}`);
-                        styleContents.push(fs.readFileSync(styleFile, 'utf-8'));
-                    }
-                }
-            }
-            if (styleContents.length > 0) {
-                inlineStyles = styleContents.join('\n');
-                if (bundleOptions.minify) {
-                    const cssResult = await esbuild.transform(inlineStyles, {
-                        loader: 'css',
-                        minify: true
-                    });
-                    inlineStyles = cssResult.code;
-                }
-                console.log('   ✓ Bundled global styles');
-            }
-        }
+        const entry = this.resolveEntryPoint(target, srcDir);
+        const inlineStyles = await this.collectStyles(target, srcDir, bundleOptions.minify ?? true);
         console.log('   Building with esbuild...');
-        const tsconfigRaw = target.tsConfigPath
-            ? fs.readFileSync(path.resolve(projectRoot, target.tsConfigPath), 'utf-8')
-            : '{}';
+        const tsconfigRaw = this.loadTsConfig(target, projectRoot);
         const result = await esbuild.build({
-            entryPoints: [entryPoint],
+            ...this.getEsbuildEntryConfig(entry),
             bundle: true,
-            outdir: outDir,
+            ...(entry.useStdin
+                ? { outfile: path.join(outDir, 'fluff-app.js') }
+                : { outdir: outDir, entryNames: '[name]' }),
             format: 'esm',
             platform: 'browser',
             target: bundleOptions.target ?? 'es2022',
@@ -413,7 +380,7 @@ Examples:
             }
         }
         if (target.assets) {
-            await this.copyAssets(target.assets, projectRoot, srcDir, outDir);
+            await this.copyAssets(target.assets, projectRoot, srcDir, outDir, target.indexHtml);
         }
         console.log(`✅ Target '${target.name}' built successfully!`);
     }
@@ -503,40 +470,14 @@ Examples:
                 }
             }
         }
-        const entryPoint = target.entryPoint
-            ? path.join(srcDir, target.entryPoint)
-            : this.generateEntryPoint(srcDir, target.exclude);
-        let inlineStyles = '';
-        if (target.styles && target.styles.length > 0) {
-            const styleContents = [];
-            for (const stylePath of target.styles) {
-                const fullPath = path.resolve(srcDir, stylePath);
-                if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile()) {
-                    console.log(`   ✓ Style: ${stylePath}`);
-                    styleContents.push(fs.readFileSync(fullPath, 'utf-8'));
-                }
-                else {
-                    const styleFiles = this.findFiles(srcDir, [stylePath]);
-                    if (styleFiles.length === 0) {
-                        console.warn(`   ⚠ Style not found: ${fullPath}`);
-                    }
-                    for (const styleFile of styleFiles) {
-                        console.log(`   ✓ Style: ${path.relative(srcDir, styleFile)}`);
-                        styleContents.push(fs.readFileSync(styleFile, 'utf-8'));
-                    }
-                }
-            }
-            if (styleContents.length > 0) {
-                inlineStyles = styleContents.join('\n');
-            }
-        }
+        const entry = this.resolveEntryPoint(target, srcDir);
+        const inlineStyles = await this.collectStyles(target, srcDir, false);
         if (target.indexHtml) {
             const indexHtmlPath = path.join(srcDir, target.indexHtml);
             if (fs.existsSync(indexHtmlPath)) {
                 const indexHtml = fs.readFileSync(indexHtmlPath, 'utf-8');
                 const transformed = await IndexHtmlTransformer.transform(indexHtml, {
-                    jsBundle: path.basename(entryPoint)
-                        .replace('.ts', '.js'),
+                    jsBundle: this.getJsBundleName(entry),
                     cssBundle: undefined,
                     inlineStyles: inlineStyles || undefined,
                     gzip: false,
@@ -547,16 +488,16 @@ Examples:
             }
         }
         if (target.assets) {
-            this.copyAssetsForServe(target.assets, projectRoot, srcDir, outDir);
+            this.copyAssetsForServe(target.assets, projectRoot, srcDir, outDir, target.indexHtml);
         }
         console.log(`🚀 Starting dev server for '${target.name}'...`);
-        const tsconfigRaw = target.tsConfigPath
-            ? fs.readFileSync(path.resolve(projectRoot, target.tsConfigPath), 'utf-8')
-            : '{}';
+        const tsconfigRaw = this.loadTsConfig(target, projectRoot);
         const ctx = await esbuild.context({
-            entryPoints: [entryPoint],
+            ...this.getEsbuildEntryConfig(entry),
             bundle: true,
-            outdir: outDir,
+            ...(entry.useStdin
+                ? { outfile: path.join(outDir, 'fluff-app.js') }
+                : { outdir: outDir, entryNames: '[name]' }),
             format: 'esm',
             platform: 'browser',
             target: 'es2022',
@@ -605,7 +546,72 @@ Examples:
             console.log('   Press Ctrl+C to stop\n');
         }
     }
-    generateEntryPoint(srcDir, exclude = []) {
+    resolveEntryPoint(target, srcDir) {
+        const useStdin = !target.entryPoint;
+        const entryPointFile = target.entryPoint ? path.join(srcDir, target.entryPoint) : null;
+        const generatedEntry = useStdin ? this.generateEntryContent(srcDir, target.exclude) : null;
+        return { useStdin, entryPointFile, generatedEntry };
+    }
+    getEsbuildEntryConfig(entry) {
+        if (entry.useStdin && entry.generatedEntry) {
+            return {
+                stdin: {
+                    contents: entry.generatedEntry.contents,
+                    resolveDir: entry.generatedEntry.resolveDir,
+                    loader: 'ts'
+                }
+            };
+        }
+        return { entryPoints: [entry.entryPointFile ?? ''] };
+    }
+    getJsBundleName(entry) {
+        if (entry.useStdin) {
+            return 'fluff-app.js';
+        }
+        return path.basename(entry.entryPointFile ?? '').replace('.ts', '.js');
+    }
+    async collectStyles(target, srcDir, minify) {
+        if (!target.styles || target.styles.length === 0) {
+            return '';
+        }
+        const styleContents = [];
+        for (const stylePath of target.styles) {
+            const fullPath = path.resolve(srcDir, stylePath);
+            if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile()) {
+                console.log(`   ✓ Style: ${stylePath}`);
+                styleContents.push(fs.readFileSync(fullPath, 'utf-8'));
+            }
+            else {
+                const styleFiles = this.findFiles(srcDir, [stylePath]);
+                if (styleFiles.length === 0) {
+                    console.warn(`   ⚠ Style not found: ${fullPath}`);
+                }
+                for (const styleFile of styleFiles) {
+                    console.log(`   ✓ Style: ${path.relative(srcDir, styleFile)}`);
+                    styleContents.push(fs.readFileSync(styleFile, 'utf-8'));
+                }
+            }
+        }
+        if (styleContents.length === 0) {
+            return '';
+        }
+        let inlineStyles = styleContents.join('\n');
+        if (minify) {
+            const cssResult = await esbuild.transform(inlineStyles, {
+                loader: 'css',
+                minify: true
+            });
+            inlineStyles = cssResult.code;
+        }
+        console.log('   ✓ Bundled global styles');
+        return inlineStyles;
+    }
+    loadTsConfig(target, projectRoot) {
+        return target.tsConfigPath
+            ? fs.readFileSync(path.resolve(projectRoot, target.tsConfigPath), 'utf-8')
+            : '{}';
+    }
+    generateEntryContent(srcDir, exclude = []) {
         const tsFiles = this.findAllTsFiles(srcDir, exclude);
         for (const f of tsFiles) {
             console.log(`   ✓ ${path.relative(srcDir, f)}`);
@@ -617,9 +623,7 @@ Examples:
         });
         const program = t.program(importDecls);
         const entryContent = generate(program, { compact: false }).code;
-        const entryPath = path.join(srcDir, '__generated_entry.ts');
-        fs.writeFileSync(entryPath, entryContent);
-        return entryPath;
+        return { contents: entryContent, resolveDir: srcDir };
     }
     findAllTsFiles(dir, userExclude = []) {
         const files = [];
@@ -632,7 +636,8 @@ Examples:
                     walk(fullPath);
                 }
                 else if (entry.isFile() && entry.name.endsWith('.ts')) {
-                    const relativePath = path.relative(dir, fullPath).replace(/\\/g, '/');
+                    const relativePath = path.relative(dir, fullPath)
+                        .replace(/\\/g, '/');
                     const isExcluded = excludePatterns.some(pattern => this.matchGlob(entry.name, pattern) || this.matchGlob(relativePath, pattern));
                     if (!isExcluded) {
                         files.push(fullPath);
@@ -666,7 +671,8 @@ Examples:
     matchesPatterns(filePath, patterns, baseDir) {
         for (const pattern of patterns) {
             const patternPath = path.join(baseDir, pattern);
-            if (fs.existsSync(patternPath) && fs.statSync(patternPath).isDirectory()) {
+            if (fs.existsSync(patternPath) && fs.statSync(patternPath)
+                .isDirectory()) {
                 const normalizedFile = filePath.replace(/\\/g, '/');
                 const normalizedPattern = pattern.replace(/\\/g, '/');
                 if (normalizedFile.startsWith(normalizedPattern + '/') || normalizedFile === normalizedPattern) {
@@ -684,11 +690,12 @@ Examples:
         const isMatch = picomatch(pattern, { dot: false });
         return isMatch(normalizedPath);
     }
-    async copyAssets(assets, projectRoot, srcDir, outDir) {
+    async copyAssets(assets, projectRoot, srcDir, outDir, indexHtml) {
         const compiler = new ComponentCompiler();
         for (const asset of assets) {
             const assetPath = path.resolve(srcDir, asset);
-            if (fs.existsSync(assetPath) && fs.statSync(assetPath).isDirectory()) {
+            if (fs.existsSync(assetPath) && fs.statSync(assetPath)
+                .isDirectory()) {
                 const dirName = path.basename(assetPath);
                 const targetDir = path.join(outDir, dirName);
                 await this.copyDirectoryRecursive(assetPath, targetDir, compiler);
@@ -704,6 +711,8 @@ Examples:
                     if (filePath.endsWith('.component.css'))
                         continue;
                     const relativePath = path.relative(srcDir, filePath);
+                    if (indexHtml && relativePath === indexHtml)
+                        continue;
                     const outPath = path.join(outDir, relativePath);
                     const outFileDir = path.dirname(outPath);
                     if (!fs.existsSync(outFileDir)) {
@@ -723,10 +732,11 @@ Examples:
             }
         }
     }
-    copyAssetsForServe(assets, projectRoot, srcDir, outDir) {
+    copyAssetsForServe(assets, projectRoot, srcDir, outDir, indexHtml) {
         for (const asset of assets) {
             const assetPath = path.resolve(srcDir, asset);
-            if (fs.existsSync(assetPath) && fs.statSync(assetPath).isDirectory()) {
+            if (fs.existsSync(assetPath) && fs.statSync(assetPath)
+                .isDirectory()) {
                 const dirName = path.basename(assetPath);
                 const targetDir = path.join(outDir, dirName);
                 this.copyDirectoryRecursiveSync(assetPath, targetDir);
@@ -743,6 +753,8 @@ Examples:
                     if (filePath.endsWith('.ts'))
                         continue;
                     const relativePath = path.relative(srcDir, filePath);
+                    if (indexHtml && relativePath === indexHtml)
+                        continue;
                     const outPath = path.join(outDir, relativePath);
                     const outFileDir = path.dirname(outPath);
                     if (!fs.existsSync(outFileDir)) {

package/ComponentCompiler.js

@@ -3,8 +3,8 @@ import { parse } from '@babel/parser';
 import * as t from '@babel/types';
 import * as esbuild from 'esbuild';
 import * as fs from 'fs';
-import * as parse5 from 'parse5';
 import { minify as minifyHtml } from 'html-minifier-terser';
+import * as parse5 from 'parse5';
 import * as path from 'path';
 import { SourceMapConsumer, SourceMapGenerator } from 'source-map';
 import classTransformPlugin from './babel-plugin-class-transform.js';

package/DevServer.js

@@ -1,6 +1,6 @@
-import * as http from 'node:http';
-import * as fs from 'node:fs';
 import httpProxy from 'http-proxy';
+import * as fs from 'node:fs';
+import * as http from 'node:http';
 export class DevServer {
     options;
     proxy;

package/Typeguards.d.ts

@@ -20,5 +20,11 @@ export declare class Typeguards {
         startOffset: number;
         endOffset: number;
     }>;
+    static hasPipeN(value: unknown): value is {
+        n: unknown;
+    };
+    static hasPipeA(value: unknown): value is {
+        a: unknown[];
+    };
 }
 //# sourceMappingURL=Typeguards.d.ts.map

package/Typeguards.js

@@ -27,4 +27,10 @@ export class Typeguards {
     static isAttrsRecord(value) {
         return value !== null && typeof value === 'object';
     }
+    static hasPipeN(value) {
+        return value !== null && typeof value === 'object' && 'n' in value;
+    }
+    static hasPipeA(value) {
+        return value !== null && typeof value === 'object' && 'a' in value && Array.isArray(value.a);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluffjs/cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "type": "module",
   "main": "./index.js",
   "module": "./index.js",