@fluffjs/cli 0.0.1 → 0.0.3

package/Cli.js

@@ -294,7 +294,7 @@ Examples:
         }
         const entryPoint = target.entryPoint
             ? path.join(srcDir, target.entryPoint)
-            : await this.generateEntryPoint(srcDir, target.components);
+            : this.generateEntryPoint(srcDir, target.components);
         console.log('   Building with esbuild...');
         const result = await esbuild.build({
             entryPoints: [entryPoint],
@@ -409,25 +409,23 @@ Examples:
             throw new Error(`fluff.json not found at ${configPath}. Run 'fluff init' first.`);
         }
         const config = this.loadConfigFrom(configPath);
-        let target;
+        let target = undefined;
         if (targetOrProject) {
-            const t = config.targets[targetOrProject];
-            if (!t) {
+            target = config.targets[targetOrProject];
+            if (!target) {
                 console.error(`Target '${targetOrProject}' not found in fluff.json`);
                 process.exit(1);
             }
-            target = t;
         }
         else if (config.defaultTarget) {
-            const t = config.targets[config.defaultTarget];
-            if (!t) {
+            target = config.targets[config.defaultTarget];
+            if (!target) {
                 console.error(`Default target '${config.defaultTarget}' not found in fluff.json`);
                 process.exit(1);
             }
-            target = t;
         }
         else {
-            target = Object.values(config.targets)[0];
+            [target] = Object.values(config.targets);
             if (!target) {
                 console.error('No targets found in fluff.json');
                 process.exit(1);
@@ -449,7 +447,7 @@ Examples:
         const host = serveOptions.host ?? 'localhost';
         const entryPoint = target.entryPoint
             ? path.join(srcDir, target.entryPoint)
-            : await this.generateEntryPoint(srcDir, target.components);
+            : this.generateEntryPoint(srcDir, target.components);
         if (target.indexHtml) {
             const indexHtmlPath = path.join(srcDir, target.indexHtml);
             if (fs.existsSync(indexHtmlPath)) {
@@ -511,7 +509,7 @@ Examples:
         console.log(`   Server running at http://${hosts[0]}:${actualPort}`);
         console.log('   Press Ctrl+C to stop\n');
     }
-    async generateEntryPoint(srcDir, componentPatterns) {
+    generateEntryPoint(srcDir, componentPatterns) {
         const componentFiles = this.findFiles(srcDir, componentPatterns);
         const imports = componentFiles.map(f => {
             const relativePath = './' + path.relative(srcDir, f)

package/Generator.d.ts

@@ -9,6 +9,7 @@ export declare class Generator {
     private toPascalCase;
     private toTitleCase;
     private getPackageJson;
+    private getCliVersion;
     private getTsConfig;
     private getFluffJson;
     private getIndexHtml;

package/Generator.js

@@ -1,5 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import { fileURLToPath } from 'url';
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export class Generator {
     generate(options) {
         const { appName, outputDir } = options;
@@ -62,6 +64,7 @@ export class Generator {
             .join(' ');
     }
     getPackageJson(name) {
+        const cliVersion = this.getCliVersion();
         return JSON.stringify({
             name,
             version: '0.0.1',
@@ -72,14 +75,24 @@ export class Generator {
                 serve: 'npx @fluffjs/cli serve'
             },
             dependencies: {
-                '@fluffjs/fluff': '^1.0.0'
+                '@fluffjs/fluff': `^${cliVersion}`
             },
             devDependencies: {
-                '@fluffjs/cli': '^1.0.0',
+                '@fluffjs/cli': `^${cliVersion}`,
                 typescript: '^5.0.0'
             }
         }, null, 2) + '\n';
     }
+    getCliVersion() {
+        const pkgPath = path.join(__dirname, 'package.json');
+        if (fs.existsSync(pkgPath)) {
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            if (typeof pkg === 'object' && pkg !== null && 'version' in pkg && typeof pkg.version === 'string') {
+                return pkg.version;
+            }
+        }
+        return '0.0.1';
+    }
     getTsConfig() {
         return JSON.stringify({
             compilerOptions: {

package/IndexHtmlTransformer.js

@@ -1,35 +1,8 @@
 import { minify } from 'html-minifier-terser';
 import * as parse5 from 'parse5';
 import { html as parse5Html } from 'parse5';
-export async function transformIndexHtml(html, options) {
-    const doc = parse5.parse(html);
-    const jsSrc = options.gzip ? `${options.jsBundle}.gz` : options.jsBundle;
-    const cssSrc = options.cssBundle
-        ? (options.gzip ? `${options.cssBundle}.gz` : options.cssBundle)
-        : null;
-    const head = findElement(doc, 'head');
-    const body = findElement(doc, 'body');
-    if (head && cssSrc) {
-        appendChild(head, createLinkElement(cssSrc));
-    }
-    if (body) {
-        appendChild(body, createScriptElement(jsSrc));
-    }
-    let result = parse5.serialize(doc);
-    if (options.liveReload) {
-        result = result.replace('</body>', getLiveReloadScript() + '</body>');
-    }
-    if (options.minify) {
-        result = await minify(result, {
-            collapseWhitespace: true,
-            removeComments: true,
-            removeRedundantAttributes: true,
-            removeEmptyAttributes: true,
-            minifyCSS: true,
-            minifyJS: true
-        });
-    }
-    return result;
+function isElement(node) {
+    return 'tagName' in node;
 }
 function findElement(node, tagName) {
     if (isElement(node) && node.tagName === tagName) {
@@ -44,9 +17,6 @@ function findElement(node, tagName) {
     }
     return null;
 }
-function isElement(node) {
-    return 'tagName' in node;
-}
 function appendChild(parent, child) {
     child.parentNode = parent;
     parent.childNodes.push(child);
@@ -95,3 +65,33 @@ function getLiveReloadScript() {
     location.reload();
 });</script>`;
 }
+export async function transformIndexHtml(html, options) {
+    const doc = parse5.parse(html);
+    const jsSrc = options.gzip ? `${options.jsBundle}.gz` : options.jsBundle;
+    const cssSrc = options.cssBundle
+        ? (options.gzip ? `${options.cssBundle}.gz` : options.cssBundle)
+        : null;
+    const head = findElement(doc, 'head');
+    const body = findElement(doc, 'body');
+    if (head && cssSrc) {
+        appendChild(head, createLinkElement(cssSrc));
+    }
+    if (body) {
+        appendChild(body, createScriptElement(jsSrc));
+    }
+    let result = parse5.serialize(doc);
+    if (options.liveReload) {
+        result = result.replace('</body>', getLiveReloadScript() + '</body>');
+    }
+    if (options.minify) {
+        result = await minify(result, {
+            collapseWhitespace: true,
+            removeComments: true,
+            removeRedundantAttributes: true,
+            removeEmptyAttributes: true,
+            minifyCSS: true,
+            minifyJS: true
+        });
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluffjs/cli",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "type": "module",
   "main": "./index.js",
   "module": "./index.js",
@@ -17,8 +17,8 @@
     }
   },
   "files": [
-    "*.js",
-    "*.d.ts",
+    "**/*.js",
+    "**/*.d.ts",
     "!*.tsbuildinfo"
   ],
   "dependencies": {

package/types/FluffConfig.d.ts

@@ -0,0 +1,29 @@
+export interface BundleOptions {
+    minify?: boolean;
+    splitting?: boolean;
+    target?: string;
+    gzip?: boolean;
+    external?: string[];
+}
+export interface ServeOptions {
+    port?: number;
+    host?: string;
+}
+export interface FluffTarget {
+    name: string;
+    srcDir: string;
+    outDir: string;
+    entryPoint?: string;
+    indexHtml?: string;
+    components: string[];
+    assets?: string[];
+    bundle?: BundleOptions;
+    serve?: ServeOptions;
+}
+export interface FluffConfig {
+    version: string;
+    targets: Record<string, FluffTarget>;
+    defaultTarget?: string;
+}
+export declare const DEFAULT_CONFIG: FluffConfig;
+//# sourceMappingURL=FluffConfig.d.ts.map

package/types/FluffConfig.js

@@ -0,0 +1,24 @@
+export const DEFAULT_CONFIG = {
+    version: '1.0',
+    targets: {
+        app: {
+            name: 'app',
+            srcDir: 'src',
+            outDir: 'dist',
+            entryPoint: 'main.ts',
+            indexHtml: 'index.html',
+            components: ['**/*.component.ts'],
+            assets: ['**/*.html', '**/*.css'],
+            bundle: {
+                minify: true,
+                gzip: true,
+                target: 'es2022'
+            },
+            serve: {
+                port: 3000,
+                host: 'localhost'
+            }
+        }
+    },
+    defaultTarget: 'app'
+};