@cyklang/cli 0.2.1 → 0.2.3

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)

package/src/ModuleCommand.ts

@@ -25,8 +25,9 @@ Otherwise, a new module is inserted in the database. To rename a module, use opt
         // list
         this.addCommand(new ModuleList('list', 'List modules'))
         this.addCommand(new ModuleList('l', 'shortcut for (l)ist'))
-        // rename
-
+        // rename **TODO**
+        // delete
+        this.addCommand(new ModuleDelete('delete', 'delete module from database'))
     }
 }
 
@@ -197,10 +198,10 @@ class ModuleDelete extends Cmd {
     constructor(name: string, description: string) {
         super(name)
         this.description(description)
-        .argument('[files...]', 'module(s) to delete from the database')
-        .action(async(files: any, options: any) => {
-            await this.commandDelete(files, options)
-        })
+            .argument('[files...]', 'module(s) to delete from the database')
+            .action(async (files: any, options: any) => {
+                await this.commandDelete(files, options)
+            })
     }
     async commandDelete(files: string[], options: any) {
         try {
@@ -208,12 +209,17 @@ class ModuleDelete extends Cmd {
             if (this.dbManager === undefined) throw 'dbManager undefined'
 
             if (files.length === 0) throw 'no module to delete'
-
+            const dbClient = new DBClient(this.dbManager)
+            for (let ind = 0; ind < files.length; ind++) {
+                const dbname = files.at(ind)
+                if (dbname !== undefined)
+                    dbClient.deleteModule(dbname)
+            }
 
         }
-        catch (err){
+        catch (err) {
             logger.error(err)
-        } 
+        }
     }
 }
 

package/src/TestCommand.ts

@@ -22,7 +22,7 @@ export class TestCommand extends Cmd {
             for (let ind=0; ind < files.length; ind++) {
                 const result = await testfile(files[ind])
                 if (result === false) {
-                    logger.debug('*********** FAILURE ' + process.argv[ind] + ' ***************')
+                    logger.debug('*********** FAILURE ' + files[ind] + ' ***************')
                 }
             }
         }

package/test/t09.output

@@ -1,4 +1,4 @@
-date of birth : 1963-11-04 00:00:00 GMT+0400, now : 2022-07-22 15:31:35 GMT+0400
+date of birth : 1963-11-04 00:00:00 GMT+0100
 french true
 150
 160

package/test/t09.xml

@@ -6,7 +6,7 @@
         <boolean name="french">true</boolean>
     </object>
 
-    <print>"date of birth : " + dates.datebirth + ", now : "+dates.datenow</print>
+    <print>"date of birth : " + dates.datebirth </print>
     <print>"french " + dates.french </print>
 
     <number name="num1"/>

package/test/t17.output

@@ -3,3 +3,5 @@ d2 : 2022-06-26
 DEBIT NULL OR UNDEFINED
 100
 -100
+Expression with boolean terms
+TRUE = VRAI

package/test/t17.xml

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <string name="d1">"2022-07-14"</string>
     <print>"day : "+datepart("day", d1)+", month : "+datepart("month", d1)+", year : "+datepart("year", d1)</print>
@@ -18,4 +18,6 @@
         if(entry.entry_debit == null || entry.entry_debit == undefined, 0, entry.entry_debit)
         - if(entry.entry_credit == null || entry.entry_credit == undefined, 0, entry.entry_credit)
     </print>
+    <print>"Expression with boolean terms"</print>
+    <print><![CDATA[ "TRUE = " + (true && "VRAI") ]]>  </print>
 </module>

package/test/t20.xml

@@ -1,5 +1,5 @@
 <?xml-model href="cyklang.xsd" ?>
-<module name="t20" dbname="t20">
+<module>
     <object name="settings"/>
     <function name="__init__">
         <object name="settings"/>

package/test/t21.xml

@@ -1,12 +1,18 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
+    <string name="chaine"/>
+    <set name="chaine" literal="">A + B</set>
+    <print>"chaine = " +chaine</print>
+
     <object name="params">
         <string name="name">"Dupont"</string>
         <string name="surname">"Jean"</string>
     </object>
-    <module_object name="m_t20" dbname="t20">
-        <object name="settings">params</object>
-    </module_object>    
+    <module_object name="m_t20"/>
+    <set name="m_t20" module="t20">
+        <object name="settings">params</object> 
+    </set> 
+ 
     <!-- <call object="m_t20" method="__init__">
         <object name="settings">params</object>
     </call> -->
@@ -56,7 +62,7 @@
     <set name="bool">boolean("")</set>
     <print>"bool : " + bool</print>
     
-    <string name="chaine">150</string>
+    <set name="chaine">150</set>
     <print>"chaine : " + chaine</print>
 
     <object name="document">

package/test/t23.output

@@ -0,0 +1,48 @@
+Client side : <string name="name" literal="">CYK</string>
+<string name="surname" literal="">Philippe</string>
+<object name="setting">
+    <object name="jnl_id">
+        <string name="stg_code" literal="">jnl_id</string>
+        <number name="stg_num">2</number>
+        <string name="stg_text">
+        </string>
+        <string name="stg_label" literal="">ID journal de Saisie</string>
+    </object>
+    <object name="month_begin">
+        <string name="stg_code" literal="">month_begin</string>
+        <number name="stg_num">
+        </number>
+        <string name="stg_text" literal="">2021-01-01</string>
+        <string name="stg_label" literal="">1er Jour du Mois de Saisie</string>
+    </object>
+    <object name="year">
+        <string name="stg_code" literal="">year</string>
+        <number name="stg_num">2021</number>
+        <string name="stg_text">
+        </string>
+        <string name="stg_label" literal="">Year</string>
+    </object>
+    <object name="acct_num">
+        <string name="stg_code" literal="">acct_num</string>
+        <number name="stg_num">
+        </number>
+        <string name="stg_text" literal="">10131</string>
+        <string name="stg_label" literal="">Numéro de Compte</string>
+    </object>
+</object>
+<object name="meta">
+    <string name="setting" literal="">&lt;db.table name=&quot;setting&quot; id=&quot;19&quot;&gt;
+    &lt;string name=&quot;stg_code&quot; type=&quot;varchar(30)&quot; primary=&quot;&quot;&gt;
+    &lt;/string&gt;
+    &lt;number name=&quot;stg_num&quot; type=&quot;int&quot;&gt;
+    &lt;/number&gt;
+    &lt;string name=&quot;stg_text&quot; type=&quot;varchar(255)&quot;&gt;
+    &lt;/string&gt;
+    &lt;string name=&quot;stg_label&quot; type=&quot;varchar(255)&quot;&gt;
+    &lt;/string&gt;
+&lt;/db.table&gt;</string>
+</object>
+Third (1 sec)
+Second (2 sec)
+First (3 sec)
+ AFTER parallel 

package/test/t23.xml

@@ -13,14 +13,14 @@
 
     <call function="call_get_tables"/>
 
-    <print>now()</print>
+    <!-- <print>now()</print> -->
 
     <function name="wait">
         <number name="duration">1000</number>
         <string name="message"/>
         <block>
             <sleep>duration</sleep>
-            <print>now() + ' ' + message</print>
+            <print>message</print>
         </block>
     </function>
 
@@ -39,6 +39,6 @@
         </call>
     </parallel>
 
-    <print>now() + " AFTER parallel "</print>
+    <print>" AFTER parallel "</print>
 
 </module>