@cyklang/cli 0.2.1 → 0.2.2

package/build/InitCommand.d.ts

@@ -1,7 +1,13 @@
 import { Command } from "commander";
 export declare class InitCommand extends Command {
+    PGPORT: string;
+    USER_NAME: string;
+    USER_PASSWORD: string;
+    USER_EMAIL: string;
+    CYK_PORT: string;
     constructor(name: string);
     commandInit(options: any): Promise<void>;
+    promptParameters(): Promise<void>;
     getRandomInt(min: number, max: number): number;
     generateToken(): string;
     writeEnvFile(): Promise<void>;

package/build/InitCommand.js

@@ -18,16 +18,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitCommand = void 0;
 const commander_1 = require("commander");
 const fs = __importStar(require("fs"));
+const inquirer_1 = __importDefault(require("inquirer"));
 const loglevel_1 = require("loglevel");
 const logger = (0, loglevel_1.getLogger)('InitCommand.ts');
 logger.setLevel('debug');
 class InitCommand extends commander_1.Command {
     constructor(name) {
         super(name);
+        this.PGPORT = "5432";
+        this.USER_NAME = "cyk";
+        this.USER_PASSWORD = "cyk";
+        this.USER_EMAIL = "my-email@my-domain";
+        this.CYK_PORT = "3000";
         this.description('initialize a folder with files necessary for a cyklang project')
             .action(async (options) => {
             await this.commandInit(options);
@@ -35,6 +44,7 @@ class InitCommand extends commander_1.Command {
     }
     async commandInit(options) {
         try {
+            await this.promptParameters();
             await this.writeEnvFile();
             await this.writeDockerComposeFile();
         }
@@ -42,6 +52,24 @@ class InitCommand extends commander_1.Command {
             logger.error(err);
         }
     }
+    async promptParameters() {
+        const reply = await inquirer_1.default.prompt([
+            { type: "number", name: 'PGPORT', default: this.PGPORT, message: 'Postgresql Port' },
+            { type: 'number', name: 'CYK_PORT', default: this.CYK_PORT, message: 'NodeJS Port' },
+            { type: 'input', name: 'USER_NAME', default: this.USER_NAME, message: 'Admin User Login' },
+            { type: 'input', name: 'USER_PASSWORD', default: this.USER_PASSWORD, message: 'Admin User Password' },
+            { type: 'input', name: 'USER_EMAIL', default: this.USER_EMAIL, message: 'Admin Use Email' },
+            { type: "confirm", name: 'confirm' }
+        ]);
+        // logger.debug(reply)
+        if (reply.confirm === false)
+            throw 'Command cancelled';
+        this.PGPORT = reply.PGPORT;
+        this.CYK_PORT = reply.CYK_PORT;
+        this.USER_NAME = reply.USER_NAME;
+        this.USER_PASSWORD = reply.USER_PASSWORD;
+        this.USER_EMAIL = reply.USER_EMAIL;
+    }
     // developer.mozilla.org Math.random()
     // On renvoie un entier aléatoire entre une valeur min (incluse)
     // et une valeur max (exclue).
@@ -69,7 +97,7 @@ class InitCommand extends commander_1.Command {
         const content = `# PostgreSql connection
 # used by psql command line utility
 PGHOST="localhost"
-PGPORT="4321"
+PGPORT="${this.PGPORT}"
 PGUSER="postgres"
 PGPASSWORD="postgres"
 
@@ -80,9 +108,9 @@ POSTGRES_PASSWORD="postgres"
 
 # admin user
 # created at database initialization
-ADMIN_NAME=cyk
-ADMIN_PASSWORD=cyk
-ADMIN_EMAIL=my-email@my-domain
+ADMIN_NAME=${this.USER_NAME}
+ADMIN_PASSWORD=${this.USER_PASSWORD}
+ADMIN_EMAIL=${this.USER_EMAIL}
 
 # JWT token generation
 # e.g. https://www.allkeysgenerator.com
@@ -99,10 +127,10 @@ LOGIN_APPLI="index"
 
 # credential used by cyk CLI
 
-USER_NAME=cyk
-USER_PASSWORD=cyk
-CYK_PORT="3000"
-DBREMOTE_URL="http://localhost:3000"        
+USER_NAME=${this.USER_NAME}
+USER_PASSWORD=${this.USER_PASSWORD}
+CYK_PORT="${this.CYK_PORT}"
+DBREMOTE_URL="http://localhost:${this.CYK_PORT}"        
 `;
         fs.writeFileSync(envFilename, content);
         logger.debug('created ' + envFilename);

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.2.1",
+   "version": "0.2.2",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -21,12 +21,14 @@
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",
+      "inquirer": "^8.2.5",
       "loglevel": "^1.8.0",
       "mime-types": "^2.1.35",
       "pako": "^2.0.4",
       "xml": "^1.0.1"
    },
    "devDependencies": {
+      "@types/inquirer": "^8.2.4",
       "@types/mime-types": "^2.1.1",
       "@types/pako": "^2.0.0",
       "@types/sax": "^1.2.4",

package/src/InitCommand.ts

@@ -1,11 +1,20 @@
 import { Command } from "commander";
 import * as fs from 'fs'
+import inquirer from "inquirer";
 import { getLogger } from "loglevel";
+
 const logger = getLogger('InitCommand.ts')
 
 logger.setLevel('debug')
 
 export class InitCommand extends Command {
+
+    PGPORT="5432"
+    USER_NAME="cyk"
+    USER_PASSWORD="cyk"
+    USER_EMAIL="my-email@my-domain"
+    CYK_PORT="3000"
+
     constructor(name: string) {
         super(name)
         this.description('initialize a folder with files necessary for a cyklang project')
@@ -15,6 +24,7 @@ export class InitCommand extends Command {
     }
     async commandInit(options: any) {
         try {
+            await this.promptParameters()
             await this.writeEnvFile()
             await this.writeDockerComposeFile()
         }
@@ -23,6 +33,26 @@ export class InitCommand extends Command {
         }
     }
 
+    async promptParameters() {
+        
+        const reply = await inquirer.prompt([
+            
+            {type: "number", name: 'PGPORT', default: this.PGPORT, message: 'Postgresql Port' },
+            {type: 'number', name: 'CYK_PORT', default: this.CYK_PORT, message: 'NodeJS Port'},
+            {type: 'input', name: 'USER_NAME', default: this.USER_NAME, message: 'Admin User Login'},
+            {type: 'input', name: 'USER_PASSWORD', default: this.USER_PASSWORD, message: 'Admin User Password'},
+            {type: 'input', name: 'USER_EMAIL', default: this.USER_EMAIL, message: 'Admin Use Email'},
+            {type: "confirm", name: 'confirm'}
+        ])
+        // logger.debug(reply)
+        if (reply.confirm === false) throw 'Command cancelled'
+        this.PGPORT = reply.PGPORT
+        this.CYK_PORT = reply.CYK_PORT
+        this.USER_NAME = reply.USER_NAME
+        this.USER_PASSWORD = reply.USER_PASSWORD
+        this.USER_EMAIL = reply.USER_EMAIL
+    }
+
     // developer.mozilla.org Math.random()
     // On renvoie un entier aléatoire entre une valeur min (incluse)
     // et une valeur max (exclue).
@@ -49,11 +79,12 @@ export class InitCommand extends Command {
             logger.info(envFilename + ' file already exists. Remove it before launching init command')
             return
         }
+
         Math.random()
         const content = `# PostgreSql connection
 # used by psql command line utility
 PGHOST="localhost"
-PGPORT="4321"
+PGPORT="${this.PGPORT}"
 PGUSER="postgres"
 PGPASSWORD="postgres"
 
@@ -64,9 +95,9 @@ POSTGRES_PASSWORD="postgres"
 
 # admin user
 # created at database initialization
-ADMIN_NAME=cyk
-ADMIN_PASSWORD=cyk
-ADMIN_EMAIL=my-email@my-domain
+ADMIN_NAME=${this.USER_NAME}
+ADMIN_PASSWORD=${this.USER_PASSWORD}
+ADMIN_EMAIL=${this.USER_EMAIL}
 
 # JWT token generation
 # e.g. https://www.allkeysgenerator.com
@@ -83,10 +114,10 @@ LOGIN_APPLI="index"
 
 # credential used by cyk CLI
 
-USER_NAME=cyk
-USER_PASSWORD=cyk
-CYK_PORT="3000"
-DBREMOTE_URL="http://localhost:3000"        
+USER_NAME=${this.USER_NAME}
+USER_PASSWORD=${this.USER_PASSWORD}
+CYK_PORT="${this.CYK_PORT}"
+DBREMOTE_URL="http://localhost:${this.CYK_PORT}"        
 `
         fs.writeFileSync(envFilename, content)
         logger.debug('created ' + envFilename)