sinto 1.10.1 → 1.11.0

package/README.md

@@ -53,14 +53,15 @@ This command is generate public directory from src directory.
 * sin serve - Start development server
 * sin build - Start public generation
 * sin rmno - Delete node_modules directory
-* sin api - Generate fake REST API with hai-server
+* sin api - Adding fake REST API with hai-server
+* sin pup - Adding Puppeteer test with Mocha
+
+Standalone server generators:
+
 * sin webpack - Generate Webpack project
-* sin pup - Generate Puppeteer test with Mocha
-* sin addts - Generate tsconfig.json and add dependencies
-* sin ts - Initialize TypeScript Node.js project
+* sin ts - Generate TypeScript Node.js project
 * sin web - Generate HTML and empty CSS files
 * sin esbuild - Generate esbuild project
-* sin javafx - Generate JavaFX project
 
 For web application, the default task manager is gulp. Development serve is browser-sync.
 
@@ -85,34 +86,6 @@ app01/
   `-README.md
 ```
 
-## Webpack project generator
-
-The sin webpack command generate a webpack project.
-
-Using:
-
-```cmd
-sin webpack
-npm i
-```
-
-Generated directories and files:
-
-```txt
-app01/
-  |-assets/
-  |-dist/
-  |  `-index.html
-  |-src/
-  |  |-js/
-  |  |  `-index.js
-  |  `-scss/
-  |     `-style.scss
-  |-package.json
-  |-README.md
-  `-webpack.config.js
-```
-
 ## Puppeteer test with Mocha
 
 The **sin pup** command generate a Puppeteer test with Mocha default test file.
@@ -156,23 +129,35 @@ Write the tests in test directory and run the tests:
 npm test
 ```
 
-## TypeScript
-
-### TypeScript config and dependencies
-
-The **sin addts** command generate a tsconfig.json and add dependencies to package.json.
+## Webpack project generator
 
-The **sin addts** command does not install the dependencies, it just writes them into the package.json file. Install the dependencies with the **npm i** or **pnpm i** command.
+The sin webpack command generate a webpack project.
 
 Using:
 
 ```cmd
-sin init
-sin addts
+sin webpack
 npm i
 ```
 
-### TypeScript Node.js project
+Generated directories and files:
+
+```txt
+app01/
+  |-assets/
+  |-dist/
+  |  `-index.html
+  |-src/
+  |  |-js/
+  |  |  `-index.js
+  |  `-scss/
+  |     `-style.scss
+  |-package.json
+  |-README.md
+  `-webpack.config.js
+```
+
+## TypeScript
 
 The **sin ts** command generate a TypeScript Node.js project.
 
@@ -262,22 +247,3 @@ 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,7 +6,7 @@
   "test": "echo \"Error: no test specified\" && exit 1",
   "start": "browser-sync start --config bs-config.json",
   "preview": "browser-sync start --server dist",
-  "dev": "npx esbuild src/**/.ts --outdir=public --bundle --watch",
+  "dev": "npx esbuild src/**/*.ts --outdir=public --bundle --watch",
   "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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sinto",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Project development manager for web and JavaFX",
   "bin": {
     "sin": "sin.js"

package/sin.js

@@ -9,7 +9,6 @@ const { createApi } = require('./haiserver/apigen');
 const { createWebpack } = require('./webpack/generate');
 const { createEsbuildProject } = require('./esbuild/generate');
 const { createPuppeteerTest } = require('./gentest/generate');
-const { supplementTypescript } = require('./addts/addts');
 const { initTypescriptProject } = require('./gents/gents');
 const { createIndexHtmlCssFile } = require('./htmlcss/htmlcss');
 
@@ -18,7 +17,7 @@ const program = new Command();
 program
     .name('sin')
     .description('Project handler')
-    .version('1.10.1');
+    .version('1.11.0');
 
 program
     .command('init')
@@ -70,13 +69,6 @@ program
         await createPuppeteerTest();
     })
 
-program
-    .command('addts')
-    .description('Supplement with TypeScript')
-    .action(() => {
-        supplementTypescript();
-    })
-
 program
     .command('ts')
     .description('Initialize TypeScript Node.js project')
@@ -98,14 +90,6 @@ program
     .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();

package/addts/addts.js

@@ -1,43 +0,0 @@
-const tsconfigContent = require('./tsconfigContent.js');
-const { createFile } = require('../tools/tools.js');
-const jsonfile = require('jsonfile');
-const { addDevDep } = require('../tools/dep.js');
-
-const fs = require('fs');
-
-const supplementTypescript = () => {
-    writeConfigFile();
-    showMsg();
-    addDependencies();
-}
-
-const writeConfigFile = () => {
-    const dir = process.cwd();
-    const path = `${dir}/tsconfig.json`;
-    jsonfile.writeFileSync(path, tsconfigContent, { spaces: 2 });
-}
-
-const showMsg = () => {
-    console.log(`
-Install dependencies with npm or pnpm command:
-
-pnpm install
-        `);
-}
-
-const addDependencies = () => {
-
-    const dir = process.cwd();
-    const path = `${dir}/package.json`;
-
-    if (!fs.existsSync(path)) {
-        console.log('package.json file does not exist.');
-        return;
-    }
-    
-
-
-    addDevDep(path, ['typescript']);
-}
-
-module.exports.supplementTypescript = supplementTypescript;

package/addts/tsconfigContent.js

@@ -1,13 +0,0 @@
-
-const tsconfigContent = 
-{
-    "compilerOptions": {
-        "target": "ES6",
-        "module": "ES6",
-        "outDir": "./app",
-        "strict": true,
-        "esModuleInterop": true
-    }
-}
-
-module.exports = tsconfigContent;

package/javafx/appContent.js

@@ -1,46 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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

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

package/javafx/launchContent.js

@@ -1,17 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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

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