frontfire 0.7.0 → 0.8.1

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "frontfire",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
     "start": "node src/index.js",
+    "start -version": "node src/index.js version",
+    "create in test": "node src/index.js create \"Hello World\"",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -23,6 +25,7 @@
     "chalk": "^5.2.0",
     "commander": "^10.0.0",
     "conf": "^11.0.1",
+    "download-git-repo": "^3.0.2",
     "ejs": "^3.1.10",
     "esbuild": "^0.19.5",
     "esbuild-copy-static-files": "^0.1.0",
@@ -31,7 +34,8 @@
     "lodash": "^4.17.21",
     "luxon": "^3.5.0",
     "php-server": "^1.0.0",
-    "prettier": "^2.8.4"
+    "prettier": "^2.8.4",
+    "slugify": "^1.6.6"
   },
   "bin": {
     "frontfire": "src/index.js"

package/src/DefaultConfig.js

@@ -48,14 +48,6 @@ for ( let ri = 0; ri < rootFiles.length; ri++ )
 
 const buildDir = `build`;
 const entryPoints = [
-    /*
-    "src/app/main.js",
-    "src/app/main.css"
-     */
-    /*
-    path.resolve( './src/app/main.js' ),
-    path.resolve( './src/app/main.css' )
-     */
     `./src/app/main.js`,
     `./src/app/main.css`
 ];
@@ -139,7 +131,6 @@ export default {
                   recursive: true
               })
           ]
-
       }
   }
 };

package/src/FrontFire.js

@@ -127,7 +127,7 @@ export default async function frontFire( isWatch, cfg = {} )
 
         // CACHEBREAK
         let indexContent = fs.readFileSync( `${rootBuildDir}${path.sep}release${path.sep}index.html`,  { encoding: 'utf8', flag: 'r' } );
-        const changedContent = indexContent.replace( /IFJSCACHEBREAK/g, (DateTime.now()).valueOf() );
+        const changedContent = indexContent.replace( /INFRONTCACHEBREAK/g, (DateTime.now()).valueOf() );
         fs.writeFileSync( `${rootBuildDir}${path.sep}release${path.sep}index.html`, changedContent );
     }
 };

package/src/index.js

@@ -1,14 +1,21 @@
 #! /usr/bin/env node
 
 import fs from "node:fs";
-import { readdir, readFile } from 'node:fs/promises';
+import { readdir, readFile, writeFile, unlink } from 'node:fs/promises';
 import ejs from "ejs";
 import chalk from "chalk";
+import download from "download-git-repo";
+import { promisify } from "util";
+import { exec } from "child_process";
+import pkg from "./../package.json" with { type: "json" };
 
 import _ from "lodash";
 import prettier from "prettier";
 import { program } from "commander";
 import path from "node:path";
+import { createInterface } from "readline";
+import { stdin as input, stdout as output } from "node:process";
+import slugify from "slugify";
 
 import frontFire from "./FrontFire.js";
 import defaultConfig from "./DefaultConfig.js";
@@ -20,8 +27,19 @@ import stateTemplate from "./templates/state-template.html.js";
 import poIndex from "./templates/po-index.js";
 import dictTemplate from "./templates/dictionary.js";
 
+async function askYesNo(question) {
+  const rl = createInterface({ input, output });
+  const answer = await new Promise((resolve) => {
+    rl.question(question, (ans) => resolve(ans.trim()));
+  });
+  rl.close();
+  return /^(y|yes)$/i.test(answer);
+}
+
 async function performInit()
 {
+    const { default: defaultConfig } = await import("./DefaultConfig.js" );
+
     // Deep Copy
     const initConfig = JSON.parse( JSON.stringify( defaultConfig ) );
 
@@ -45,26 +63,67 @@ async function performInit()
     }
 }
 
-async function createInfrontJsStarter( appName = null )
+async function createInfrontJsStarter( appName, appPath )
 {
+    // Callback → Promise
+    const downloadAsync = promisify(download);
+
+    async function downloadRepo(repo, targetDir) {
+        try {
+            await downloadAsync(repo, targetDir, { clone: false });
+        } catch (err) {
+            console.error("❌ Fehler beim Laden des Repos:", err);
+        }
+    }
+
+    async function updatePackageName(newName, packagePath = "./package.json") {
+      try {
+        const fullPath = path.resolve(packagePath);
+
+        // read package.json
+        const data = await readFile(fullPath, "utf-8");
+        const pkg = JSON.parse(data);
+
+        // replace if it matches the source name
+        if (pkg.name === "infrontjs-starter") {
+          pkg.name = newName;
+
+          await writeFile(fullPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+        } else {
+          console.log(`ℹ️ package.json name is not "infrontjs-starter" (found "${pkg.name}"), no change made.`);
+        }
+      } catch (err) {
+        console.error("❌ Failed to update package.json:", err);
+      }
+    }
+
+
     // Deep Copy
+    /*
     const initConfig = JSON.parse( JSON.stringify( defaultConfig ) );
 
     _.unset( initConfig, 'debug.esbuild.plugins' );
     _.unset( initConfig, 'release.esbuild.plugins' );
+     */
 
-    if ( null === appName || appName.length === 0 )
-    {
-        appName = 'InfrontJS Starter';
-    }
+    await downloadRepo("github:infrontjs/starter", appPath );
+    await updatePackageName( appName, `${appPath}/package.json` );
+    await unlink( `${appPath}/LICENSE` );
 
-    const srcFolder = path.resolve( '.' ) + path.separator + 'src-to-test';
+    const execAsync = promisify(exec);
+    await execAsync( "frontfire init", { cwd: appPath } );
+
+    //await writeFile( `${appPath}/frontfire.json`, JSON.stringify(initConfig, null, 2) + "\n", "utf8");
+
+    console.log(chalk.green.bold(`\nInfrontJS project "${appName}" successfully created at ${appPath}\n`));
+
+    console.log(chalk.cyan.bold("Next steps:"));
+    console.log(`  ${chalk.yellow("1.")} Change directory to ${chalk.magenta(path.resolve(appPath))}`);
+    console.log(`  ${chalk.yellow("2.")} Modify ${chalk.magenta(path.join(appPath, "frontfire.config"))} and ${chalk.magenta(path.join(appPath, "package.json"))} to your needs`);
+    console.log(`  ${chalk.yellow("3.")} Run ${chalk.blueBright("npm install")}`);
+    console.log(`  ${chalk.yellow("4.")} Run ${chalk.blueBright("frontfire start-dev")} to start development`);
+    console.log(`  ${chalk.yellow("5.")} Alternatively run ${chalk.blueBright("frontfire build")} to build your minified project before deployment\n`);
 
-    if ( true === fs.existsSync( srcFolder ) )
-    {
-        console.warn( `Sourcefolder ${srcFolder} already exists!` );
-        return;
-    }
 }
 
 async function generatesPathObject( name )
@@ -125,7 +184,7 @@ async function generatesState( name, options )
 
     console.log( chalk.green.bold( `State ${stateName} successfully generated.`) );
     console.log( chalk.italic( 'Dont forget to add the state to your states instance, e.g.' ) );
-    console.log( chalk.italic.bgWhite( `myApp.states.add( ${stateName} );`) );
+    console.log( chalk.italic.bgWhite( `myApp.states.add( ${stateName}State);`) );
 }
 
 async function generatesWebComponent( name = null )
@@ -134,15 +193,9 @@ async function generatesWebComponent( name = null )
     let className = null;
     let wcName = null;
 
-    // Deep Copy
-    const initConfig = JSON.parse( JSON.stringify( defaultConfig ) );
-
-    _.unset( initConfig, 'debug.esbuild.plugins' );
-    _.unset( initConfig, 'release.esbuild.plugins' );
-
     if ( null === name || name.length === 0 )
     {
-        console.error( 'V')
+        console.error( 'Empty web component name.')
     }
 
     fileName = name.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
@@ -303,9 +356,38 @@ program
     .action( function() { performInit(); } );
 
 program
-    .command( 'create' )
-    .description( 'Creates starter InfrontJS application.' )
-    .action( function() { createInfrontJsStarter(); } );
+    .command("create")
+    .description("Create a new InfrontJS project")
+    .argument("[appName]", "Application name", "InfrontJS Starter")
+    .argument("[appPath]", "Target directory")
+    .action(async ( appName, appPath) => {
+      const finalName = appName ?? "InfrontJS Starter";
+      if ( !appPath )
+      {
+          appPath = process.cwd();
+          appPath = path.join( appPath, slugify( finalName,  { lower: true , strict: true } ) );
+      }
+
+      const resolvedPath = path.resolve(appPath ?? process.cwd());
+
+      console.log(chalk.cyan(`\nAbout to create:`));
+      console.log(`  ${chalk.bold("Name:")} ${finalName}`);
+      console.log(`  ${chalk.bold("Path:")} ${resolvedPath}\n`);
+
+      const confirmed = await askYesNo(
+        chalk.yellow("Do you really want to create the project in this directory? (y/N) ")
+      );
+
+      if (!confirmed) {
+        console.log(chalk.red("Aborted."));
+        process.exitCode = 1;
+        return;
+      }
+
+      console.log(chalk.green("Starting..."));
+      await createInfrontJsStarter( finalName, resolvedPath );
+      console.log(chalk.green("Done."));
+    });
 
 program
     .command( 'gwc' )
@@ -340,5 +422,10 @@ program
     .description( 'Building for production.' )
     .action( function() { frontFire( false, customConfig ); } );
 
+program
+  .command( 'version' )
+  .description( 'Prints the version number.' )
+  .action( function() { console.log( pkg.version ); } );
+
 
 program.parse();