sinto 1.8.1 → 1.10.0

package/README.md

@@ -1,9 +1,6 @@
-# Sinto web project management
+# Sinto project management
 
-Simple project management, with the Browser-sync and gulp packages in the background.
-
-* Development in the src directory.
-* Publishing from the public directory.
+A generateable web application using JavaScirpt and TypeScript, and a JavaFX form application for VSCode.
 
 GitHub:
 
@@ -63,12 +60,13 @@ This command is generate public directory from src directory.
 * sin ts - Initialize TypeScript Node.js project
 * sin web - Generate HTML and empty CSS files
 * sin esbuild - Generate esbuild project
+* sin javafx - Generate JavaFX project
 
-The Default task manager is gulp. Development serve is browser-sync.
+For web application, the default task manager is gulp. Development serve is browser-sync.
 
 ## Fake REST API server
 
-The sin api command generate fake REST API project directory.
+The sin api command generate fake REST API project directory with hai-server.
 
 Using:
 
@@ -209,9 +207,31 @@ Using:
 
 ```cmd
 sin esbuild
-pnpm i
-pnpm dev
-pnpm start
+npm i
+npm run dev
+npm start
+```
+
+Generated directories and files:
+
+```txt
+app01/
+  |-public/
+  |  |-index.html
+  |  `-style.css
+  |-src/
+  |  `-index.ts
+  |-package.json
+  `-README.md
+```
+
+Or, create JavaScript client:
+
+```cmd
+sin esbuild -j
+npm i
+npm run dev
+npm start
 ```
 
 Generated directories and files:
@@ -227,20 +247,37 @@ app01/
   `-README.md
 ```
 
-Update the src/app.ts your index file.
+To development run next command:
 
-Example:
+```cmd
+npm run dev
+```
 
-* src/app.ts
-* src/index.ts
-* src/app.js
-* src/index.js
-* src/script.js
+This command is generate in public directory an app.js file from src directory.
 
 To build production run next command:
 
 ```cmd
-pnpm build
+npm run build
 ```
 
 This command is generate dist directory from src directory. The build command not copy the public directory.
+
+## JavaFX project generator
+
+The **sin javafx** command generate a JavaFX project. The generated project willl be a package generated with **No build tools** for VSCode.
+
+Steps to use:
+
+* Create project directory. For example: **mkdir app01**
+* Change directory to project directory. For example: **cd app01**
+* Create a JavaFX project with the **sin javafx** command.
+* Copy to lib dirctory JavaFX libraries.
+* Open project directory with VSCode: code .
+* Add Configuration with VSCode: **Run** > **Add Configuration..**
+* Save the .vscode/launch.json file.
+* Run project with VSCode: **Run** > **Run** This will fail.
+* Set the JavaFX path. For example: **sin javafx -p lib/javafx**
+* Open the mainScedne.fmxl file, and add components, and save.
+
+Change the path to your JavaFX path.

package/esbuild/contents/esbuildPackage.json

@@ -6,14 +6,20 @@
   "test": "echo \"Error: no test specified\" && exit 1",
   "start": "browser-sync start --config bs-config.json",
   "dev": "npx esbuild src/app.ts --outdir=public --bundle --watch",
-  "build": "npx esbuild src/app.ts --outdir=dist --bundle --minify"
+  "build:src": "npx esbuild src/app.ts --outdir=dist --bundle --minify",
+  "build:htmlcss": "cpx public/**/*.{html,css,png} dist",
+  "build:bscss": "cpx node_modules/bootstrap/dist/css/bootstrap.css dist",
+  "build:bsjs": "cpx node_modules/bootstrap/dist/js/bootstrap.js dist",
+  "build": "npm-run-all build:*"
   },
   "dependencies": {
     "bootstrap": "^5.3.3"
   },
   "devDependencies": {
     "esbuild": "^0.23.1",
-    "browser-sync": "^3.0.2"
+    "browser-sync": "^3.0.2",
+    "cpx": "^1.5.0",
+    "npm-run-all": "^4.1.5"
   }
 }
   

package/esbuild/contents/esbuildPackageJs.json

@@ -0,0 +1,25 @@
+{
+  "name": "sinto-project",
+  "version": "0.0.1",
+  "description": "A project created by the Sinto command",
+  "scripts": {
+  "test": "echo \"Error: no test specified\" && exit 1",
+  "start": "browser-sync start --config bs-config.json",
+  "dev": "npx esbuild src/app.js --outdir=public --bundle --watch",
+  "build:src": "npx esbuild src/app.js --outdir=dist --bundle --minify",
+  "build:htmlcss": "cpx public/**/*.{html,css,png} dist",
+  "build:bscss": "cpx node_modules/bootstrap/dist/css/bootstrap.css dist",
+  "build:bsjs": "cpx node_modules/bootstrap/dist/js/bootstrap.js dist",
+  "build": "npm-run-all build:*"
+  },
+  "dependencies": {
+    "bootstrap": "^5.3.3"
+  },
+  "devDependencies": {
+    "esbuild": "^0.23.1",
+    "browser-sync": "^3.0.2",
+    "cpx": "^1.5.0",
+    "npm-run-all": "^4.1.5"
+  }
+}
+  

package/esbuild/contents/gitignoreContent.js

@@ -0,0 +1,7 @@
+const gitignoreContent = `
+node_modules/
+dist/
+pnpm-lock.yaml
+public/app.js
+`
+module.exports = gitignoreContent

package/esbuild/contents/indexHtml.js

@@ -1,10 +1,22 @@
 
 module.exports = `
+<!--
+File: index.html
+Author: Vezetéknév Keresztnév
+Copyright: 2024, Vezetéknév Keresztnév
+Group: Csoportnév
+Date: 2024-12-02
+Github: https://github.com/valami12345/
+Licenc: MIT
+-->
+
 <!DOCTYPE html>
 <html lang="hu">
   <head>
     <meta charset="UTF-8">
     <title>Sinto esbuild</title>
+    <link rel="stylesheet" href="bootstrap.css">
+    <link rel="stylesheet" href="style.css">    
   </head>
   <body>
     <div class="container">
@@ -12,6 +24,7 @@ module.exports = `
         <p>The website generated by Sinto.</p>      
 
     </div>
+    <script src="bootstrap.js"></script>
     <script src="app.js"></script>
   </body>
 </html>

package/esbuild/generate.js

@@ -3,10 +3,28 @@ const { createFile, createDirectory } = require('../tools/tools.js');
 const jsonfile = require('jsonfile');
 
 const swcPackageContent = require('./contents/esbuildPackage.json');
+const swcPackageJsContent = require('./contents/esbuildPackageJs.json');
 const indexHtmlContent = require('./contents/indexHtml.js');
 const defaultBsconfigContent = require('./generators/genBsconfig.js');
+const gitignoreContent = require('./contents/gitignoreContent');
+
+const createEsbuildProject = (options) => {
+    if(options.javascript === true && options.typescript === true) {
+        console.log('JavaScript or TypeScript project?');
+        return;
+    }
+    let typescript = true;
+    if(options.javascript === false && options.typescript === false) {
+        console.log('TypeScript project creating...');
+    }
+    if(options.javascript === true) {
+        console.log('JavaScript project creating...');
+        typescript = false;
+    }
+    if(options.typescript === true) {
+        console.log('TypeScript project creating...');        
+    }    
 
-const createEsbuildProject = () => {
     const dir = process.cwd();
 
     createDirectory(`${dir}/src`);
@@ -14,24 +32,34 @@ const createEsbuildProject = () => {
     createDirectory(`${dir}/public/assets`);
   
     createFile(`${dir}/public/index.html`, indexHtmlContent);  
-    createFile(`${dir}/public/style.css`, '');  
-    createFile(`${dir}/src/app.ts`, '');
+    createFile(`${dir}/public/style.css`, '');
+    
+    if(typescript) {
+        createFile(`${dir}/src/app.ts`, '');
+    }else {
+        createFile(`${dir}/src/app.js`, '');
+    }    
 
     createFile(`${dir}/README.md`, '# Sinto ESBuild client\n');
     
-    createPackageJsonFile(dir);
+    createPackageJsonFile(dir, typescript);
     createBsconfigFile(dir);
+    createFile(`${dir}/.gitignore`, gitignoreContent);
   
     console.log('ESBuild client created.');
     console.log('Run next commands:');
-    console.log('  pnpm i');
-    console.log('  pnpm dev');
-    console.log('  pnpm start');
+    console.log('  npm i');
+    console.log('  npm run dev');
+    console.log('  npm start');
 }
 
-const createPackageJsonFile = (directory) => {
+const createPackageJsonFile = (directory, typescript) => {
     const packageJsonPath = `${directory}/package.json`;
-    jsonfile.writeFileSync(packageJsonPath, swcPackageContent, { spaces: 2 });
+    if(typescript) {
+        jsonfile.writeFileSync(packageJsonPath, swcPackageContent, { spaces: 2 });
+    }else {
+        jsonfile.writeFileSync(packageJsonPath, swcPackageJsContent, { spaces: 2 });
+    }    
     if(debug) {
         console.log('package.json file created.');
     }

package/javafx/appContent.js

@@ -0,0 +1,46 @@
+const appContent = `
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class App extends Application {
+
+    private static Scene scene;
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        scene = new Scene(loadFxml("mainScene"), 640, 480);
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    static void setRoot(String fileName) throws IOException {
+        scene.setRoot(loadFxml(fileName));
+    }
+
+    private static Parent loadFxml(String fileName) {
+        try {
+            return tryLoadFxml(fileName);
+        } catch (IOException e) {
+            System.err.println("Unable to load FXML file: " + fileName);
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+        
+    private static Parent tryLoadFxml(String fileName) throws IOException {
+        FXMLLoader loader = new FXMLLoader(App.class.getResource(fileName + ".fxml"));
+        return loader.load();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+
+}
+`
+module.exports = appContent

package/javafx/generate.js

@@ -0,0 +1,33 @@
+const { createFile, createDirectory } = require('../tools/tools.js');
+const appContent = require('./appContent');
+const settingsContent = require('./settingsContent');
+const launchContent = require('./launchContent');
+const gitignoreContent = require('./gitignoreContent');
+const { exit } = require('browser-sync');
+const { setJavafxPath } = require('./setJavafxPath');
+
+const  createJavafxProject = (argv) => {
+
+  if (argv.path != undefined) {
+    setJavafxPath(argv.path);
+    exit(0);
+  }
+
+  const dir = process.cwd();  
+  createDirectory(`${dir}/.vscode`);
+  createDirectory(`${dir}/lib`);
+  createDirectory(`${dir}/src`);
+  createFile(`${dir}/src/App.java`, appContent);
+  createFile(`${dir}/.vscode/settings.json`, settingsContent);
+  
+  createFile(`${dir}/src/mainScene.fxml`, '');
+
+  createFile(`${dir}/README.md`, '# Sinto JavaFX project\n');
+  createFile(`${dir}/.vscode/launch.json`, launchContent);
+
+  createFile(`${dir}/.gitignore`, gitignoreContent);
+  createFile(`${dir}/lib/.gitkeep`, '');
+  
+}
+
+module.exports.createJavafxProject = createJavafxProject;

package/javafx/gitignoreContent.js

@@ -0,0 +1,8 @@
+const gitignoreContent = `
+bin/
+*.jar
+*.class
+*.properties
+*.so
+`
+module.exports = gitignoreContent

package/javafx/launchContent.js

@@ -0,0 +1,17 @@
+const launchContent = `
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "Current File",
+      "request": "launch",
+      "mainClass": "\${file}"
+    }
+  ]
+}
+`
+module.exports = launchContent

package/javafx/setJavafxPath.js

@@ -0,0 +1,51 @@
+const {debug} = require('../config.json');
+const { read } = require("fs-extra");
+const jsonfile = require('jsonfile');
+const hjson = require('hjson');
+const fs = require('fs');
+
+const setJavafxPath = (path) => {
+  const dir = process.cwd();
+
+  readJsonFile(`${dir}/.vscode/launch.json`).then((data) => {
+    var obj = hjson.parse(data);
+    obj.configurations.forEach( conf => {
+      conf.vmArgs = `--module-path ${path} --add-modules javafx.controls,javafx.fxml`;
+    })
+    
+
+    var newData = hjson.stringify(obj, {space: 2, quotes: 'all', separator: true});
+    console.log('newData: ', newData);
+    writeJsonFile(`${dir}/.vscode/launch.json`, newData);
+    console.log('launch.json updated.');
+  });
+}
+
+async function readJsonFile(filePath) {
+  try {
+
+      const data = await fs.promises.readFile(filePath, 'utf8');
+      if(debug) {
+          console.log(`Readed JSON file`);
+      }        
+      return data;
+  } catch (err) {
+      console.error(`Error! Failed to read ${filePath}`);
+      console.error(err);
+  }
+}
+
+async function writeJsonFile(path, data) {
+  try {
+      await fs.promises.writeFile(path, data);
+      if(debug) {
+          console.log(`Written new JSON file: ${path}`);
+          console.log(obj);
+      }
+  } catch (err) {
+      console.error('Error! Failed to write package.json:');
+      console.error(err);
+  }
+}
+
+module.exports.setJavafxPath = setJavafxPath

package/javafx/settingsContent.js

@@ -0,0 +1,10 @@
+const settingsContent = `
+{
+    "java.project.sourcePaths": ["src"],
+    "java.project.outputPath": "bin",
+    "java.project.referencedLibraries": [
+        "lib/**/*.jar"
+    ]   
+}
+`
+module.exports = settingsContent

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sinto",
-  "version": "1.8.1",
-  "description": "Website project development manager",
+  "version": "1.10.0",
+  "description": "Project development manager for web and JavaFX",
   "bin": {
     "sin": "sin.js"
   },
@@ -15,6 +15,7 @@
     "commander": "^12.1.0",
     "fs-extra": "^11.2.0",
     "gulp": "^5.0.0",
+    "hjson": "^3.2.2",
     "jsonfile": "^6.1.0",
     "yargs": "^17.7.2"
   },

package/sin.js

@@ -18,7 +18,7 @@ const program = new Command();
 program
     .name('sin')
     .description('Project handler')
-    .version('1.8.1');
+    .version('1.10.0');
 
 program
     .command('init')
@@ -84,7 +84,6 @@ program
         initTypescriptProject();
     })
 
-
 program
     .command('web')
     .description('HTML és üres CSS fájl')
@@ -95,8 +94,18 @@ program
 program
     .command('esbuild')
     .description('ESBuild client')
-    .action(() => {
-        createEsbuildProject();
+    .option('-j, --javascript', 'JavaScript application')
+    .option('-t, --typescript', 'TypeScript application (default)')
+    .action((options) => {
+        createEsbuildProject(options);
     });
 
+program
+    .command('javafx')
+    .description('JavaFX project No build tools')
+    .option('-p, --path [path]', 'Path to javafx')
+    .action(( options ) => {
+        createJavafxProject(options);
+    })
+
 program.parse();