@fluffjs/cli 0.1.9 → 0.1.10

package/Cli.d.ts

@@ -23,6 +23,7 @@ export declare class Cli {
     private serve;
     private serveTarget;
     private generateEntryPoint;
+    private findAllTsFiles;
     private findFiles;
     private matchesPatterns;
     private matchGlob;

package/Cli.js

@@ -196,7 +196,6 @@ Examples:
                     name: targetName,
                     srcDir: `src/${targetName}`,
                     outDir: `dist/${targetName}`,
-                    components: ['**/*.component.ts'],
                     assets: ['**/*.html', '**/*.css']
                 };
                 console.log(`Added target '${targetName}' to fluff.json`);
@@ -214,7 +213,6 @@ Examples:
                         name: targetName,
                         srcDir: 'src',
                         outDir: 'dist',
-                        components: ['**/*.component.ts'],
                         assets: ['**/*.html', '**/*.css']
                     }
                 };
@@ -306,7 +304,7 @@ Examples:
         }
         const entryPoint = target.entryPoint
             ? path.join(srcDir, target.entryPoint)
-            : this.generateEntryPoint(srcDir, target.components);
+            : this.generateEntryPoint(srcDir, target.exclude);
         let inlineStyles = '';
         if (target.styles && target.styles.length > 0) {
             const styleContents = [];
@@ -507,7 +505,7 @@ Examples:
         }
         const entryPoint = target.entryPoint
             ? path.join(srcDir, target.entryPoint)
-            : this.generateEntryPoint(srcDir, target.components);
+            : this.generateEntryPoint(srcDir, target.exclude);
         let inlineStyles = '';
         if (target.styles && target.styles.length > 0) {
             const styleContents = [];
@@ -607,12 +605,12 @@ Examples:
             console.log('   Press Ctrl+C to stop\n');
         }
     }
-    generateEntryPoint(srcDir, componentPatterns) {
-        const componentFiles = this.findFiles(srcDir, componentPatterns);
-        for (const f of componentFiles) {
-            console.log(`   ✓ Component: ${path.relative(srcDir, f)}`);
+    generateEntryPoint(srcDir, exclude = []) {
+        const tsFiles = this.findAllTsFiles(srcDir, exclude);
+        for (const f of tsFiles) {
+            console.log(`   ✓ ${path.relative(srcDir, f)}`);
         }
-        const importDecls = componentFiles.map(f => {
+        const importDecls = tsFiles.map(f => {
             const relativePath = './' + path.relative(srcDir, f)
                 .replace(/\\/g, '/');
             return t.importDeclaration([], t.stringLiteral(relativePath));
@@ -623,6 +621,28 @@ Examples:
         fs.writeFileSync(entryPath, entryContent);
         return entryPath;
     }
+    findAllTsFiles(dir, userExclude = []) {
+        const files = [];
+        const excludePatterns = ['*.spec.ts', '*.test.ts', '__generated_entry.ts', ...userExclude];
+        const walk = (currentDir) => {
+            const entries = fs.readdirSync(currentDir, { withFileTypes: true });
+            for (const entry of entries) {
+                const fullPath = path.join(currentDir, entry.name);
+                if (entry.isDirectory()) {
+                    walk(fullPath);
+                }
+                else if (entry.isFile() && entry.name.endsWith('.ts')) {
+                    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);
+                    }
+                }
+            }
+        };
+        walk(dir);
+        return files;
+    }
     findFiles(dir, patterns) {
         const files = [];
         const walk = (currentDir) => {

package/babel-plugin-reactive.js

@@ -287,7 +287,7 @@ export default function reactivePlugin() {
                     constructorStatements.push(t.expressionStatement(t.unaryExpression('void', t.memberExpression(t.thisExpression(), t.identifier(methodName)))));
                     for (const prop of mProps) {
                         if (reactiveProps.has(prop)) {
-                            constructorStatements.push(t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier(`__${prop}`)), t.identifier('onChange')), t.identifier('subscribe')), [t.arrowFunctionExpression([], t.callExpression(t.memberExpression(t.thisExpression(), t.identifier(methodName)), []))])));
+                            constructorStatements.push(t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('__baseSubscriptions')), t.identifier('push')), [t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier(`__${prop}`)), t.identifier('onChange')), t.identifier('subscribe')), [t.arrowFunctionExpression([], t.callExpression(t.memberExpression(t.thisExpression(), t.identifier(methodName)), [t.stringLiteral(prop)]))])])));
                         }
                     }
                 }
@@ -299,7 +299,7 @@ export default function reactivePlugin() {
                     for (const prop of wProps) {
                         if (reactiveProps.has(prop)) {
                             iife.push(t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('__subs'), t.identifier('push')), [
-                                t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier(`__${prop}`)), t.identifier('onChange')), t.identifier('subscribe')), [t.identifier('__cb')])
+                                t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier(`__${prop}`)), t.identifier('onChange')), t.identifier('subscribe')), [t.arrowFunctionExpression([], t.callExpression(t.identifier('__cb'), [t.stringLiteral(prop)]))])
                             ])));
                         }
                     }

package/interfaces/FluffTarget.d.ts

@@ -7,8 +7,8 @@ export interface FluffTarget {
     componentsDir?: string;
     tsConfigPath?: string;
     entryPoint?: string;
+    exclude?: string[];
     indexHtml?: string;
-    components: string[];
     styles?: string[];
     assets?: string[];
     bundle?: BundleOptions;

package/package.json

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

package/types/FluffConfig.js

@@ -8,7 +8,6 @@ export const DEFAULT_CONFIG = {
             componentsDir: 'app',
             entryPoint: 'main.ts',
             indexHtml: 'index.html',
-            components: ['**/*.component.ts'],
             assets: ['**/*.html', '**/*.css'],
             bundle: {
                 minify: true,