@cyklang/cli 0.7.5 → 0.8.0

package/build/Cmd.js

@@ -44,12 +44,18 @@ class Cmd extends commander_1.Command {
         this.option('--env <env>', 'path to the environment variables file');
     }
     async prologue(options) {
-        const dotenvOutput = dotenv_1.default.config({ path: options.env });
-        if (dotenvOutput.error !== undefined)
-            throw dotenvOutput.error;
+        if (options.env || fs.existsSync('.env')) {
+            const dotenvOutput = dotenv_1.default.config({ path: options.env });
+            if (dotenvOutput.error !== undefined)
+                throw dotenvOutput.error;
+        }
         const structure = new core_1.Structure();
-        if (process.env.DBREMOTE_URL === undefined)
-            throw 'DBREMOTE_URL undefined';
+        if (!process.env.DBREMOTE_URL)
+            throw 'DBREMOTE_URL environment variable undefined';
+        if (!process.env.USER_NAME)
+            throw 'USER_NAME environment variable undefined';
+        if (!process.env.USER_PASSWORD)
+            throw 'USER_PASSWORD environment variable undefined';
         logger.info('Cyk server: ' + process.env.DBREMOTE_URL);
         const nodeCrypto = new NodeCrypto_1.NodeCrypto();
         this.dbRemote = new core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto);

package/build/TableCommand.js

@@ -320,6 +320,7 @@ class TableDropCommand extends Cmd_1.Cmd {
     constructor(name, description) {
         super(name);
         this.description(description)
+            .option('-y --yes', 'confirmation is not required')
             .argument('<table>', 'table name')
             .action(async (table, options) => {
             await this.commandDrop(table, options);
@@ -335,8 +336,14 @@ class TableDropCommand extends Cmd_1.Cmd {
                 console.log('table ' + table + ' does not exist');
                 return;
             }
-            const reply = await inquirer_1.default.prompt({ type: 'confirm', name: 'confirm', message: 'Drop table ' + table + '?' });
-            if (reply.confirm && this.dbManager) {
+            let dropConfirmed = (options.yes !== undefined);
+            if (dropConfirmed === false) {
+                const reply = await inquirer_1.default.prompt({ type: 'confirm', name: 'confirm', message: 'Drop table ' + table + '?' });
+                if (reply.confirm) {
+                    dropConfirmed = true;
+                }
+            }
+            if (dropConfirmed) {
                 await dropTable(table, this.dbManager);
             }
         }
@@ -352,7 +359,9 @@ class TableDropCommand extends Cmd_1.Cmd {
  */
 async function dropTable(table, dbManager) {
     const dbTable = await dbManager.dbTableExist(table);
-    if (dbTable)
+    if (dbTable) {
         await dbManager.dbTableDelete(dbTable);
+        console.log('table ' + dbTable.name + ' dropped');
+    }
 }
 exports.dropTable = dropTable;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.7.5",
+   "version": "0.8.0",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {

package/run_test.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cyk table drop -y t_film_actor
+cyk table drop -y t_film
+cyk table drop -y t_actor
+
+cyk module upload test/db/t20.xml
+cyk module upload test/db/t22.xml
+
+cyk test test/db/t*.xml
+

package/src/Cmd.ts

@@ -22,11 +22,16 @@ export class Cmd extends Command {
 
     async prologue(options: any): Promise<SigninResponse> {
 
-        const dotenvOutput = dotenv.config({ path: options.env })
-        if (dotenvOutput.error !== undefined) throw dotenvOutput.error
+        if (options.env || fs.existsSync('.env')) {
+            const dotenvOutput = dotenv.config({ path: options.env })
+            if (dotenvOutput.error !== undefined) throw dotenvOutput.error
+        }
 
         const structure = new Structure()
-        if (process.env.DBREMOTE_URL === undefined) throw 'DBREMOTE_URL undefined'
+        if (! process.env.DBREMOTE_URL) throw 'DBREMOTE_URL environment variable undefined'
+        if (! process.env.USER_NAME) throw 'USER_NAME environment variable undefined'
+        if (! process.env.USER_PASSWORD) throw 'USER_PASSWORD environment variable undefined'
+        
         logger.info('Cyk server: ' + process.env.DBREMOTE_URL)
         const nodeCrypto = new NodeCrypto()
         this.dbRemote = new DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto)

package/src/TableCommand.ts

@@ -324,6 +324,7 @@ class TableDropCommand extends Cmd {
     constructor(name: string, description: string) {
         super(name)
         this.description(description)
+            .option('-y --yes', 'confirmation is not required')
             .argument('<table>', 'table name')
             .action(async (table, options) => {
                 await this.commandDrop(table, options)
@@ -334,18 +335,25 @@ class TableDropCommand extends Cmd {
         try {
             await this.prologue(options)
             if (!this.dbManager) throw 'dbManager undefined'
-            
+
             const dbTable = await this.dbManager.dbTableExist(table)
             if (!dbTable) {
                 console.log('table ' + table + ' does not exist')
                 return
             }
-            const reply = await inquirer.prompt({ type: 'confirm', name: 'confirm', message: 'Drop table ' + table + '?' })
-            if (reply.confirm && this.dbManager) {
+            let dropConfirmed = (options.yes !== undefined)
+            if (dropConfirmed === false) {
+                const reply = await inquirer.prompt({ type: 'confirm', name: 'confirm', message: 'Drop table ' + table + '?' })
+                if (reply.confirm) {
+                    dropConfirmed = true
+                }
+            }
+
+            if (dropConfirmed) {
                 await dropTable(table, this.dbManager)
             }
         }
-        catch(err) {
+        catch (err) {
             logger.error(err)
         }
     }
@@ -358,8 +366,10 @@ class TableDropCommand extends Cmd {
  */
 export async function dropTable(table: string, dbManager: DBManager) {
     const dbTable = await dbManager.dbTableExist(table)
-    if (dbTable)
-        await dbManager.dbTableDelete(dbTable)
+    if (dbTable) { 
+        await dbManager.dbTableDelete(dbTable) 
+        console.log('table ' + dbTable.name + ' dropped')
+    }
 }
 
 

package/test/db/t10.output

@@ -0,0 +1,23 @@
+New film ID 1
+films_actors.resultset.at(0).t_actor.last_name CHANE YOU KAYE
+actor 1 Maria CHANE YOU KAYE, film 1 La mélodie du bonheur
+string(films_actors.resultset) : <object>
+    <object name="t_actor">
+        <number name="actor_id">1</number>
+        <string name="first_name" literal="">Maria</string>
+        <string name="last_name" literal="">CHANE YOU KAYE</string>
+        <datetime name="last_update">
+        </datetime>
+        <string name="cyk_remark" literal="">remarque</string>
+        <boolean name="cyk_disable">
+        </boolean>
+    </object>
+    <object name="t_film">
+        <number name="film_id">1</number>
+        <string name="title" literal="">La mélodie du bonheur</string>
+        <string name="description" literal="">Le film préféré de Mao</string>
+        <number name="release_year">1965</number>
+        <number name="length">60</number>
+        <number name="language_id">1</number>
+    </object>
+</object>

package/test/{t10.xml → db/t10.xml}

@@ -1,7 +1,7 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
 
-    <db.table name="actor">
+    <db.table name="t_actor">
         <number name="actor_id" type="int" primary="" generated='by default'/>
         <string name="first_name" type="varchar(50)"/>
         <string name="last_name" type="text" />
@@ -10,7 +10,7 @@
         <boolean name="cyk_disable" type="boolean"/>
     </db.table>
 
-    <db.table name="film">
+    <db.table name="t_film">
         <number name="film_id" type="int" primary="" generated='by default'/>
         <string name="title" type="varchar(255)" />
         <string name="description" type="text" />
@@ -19,23 +19,45 @@
         <number name="language_id" type="int"/>
     </db.table>
 
-    <db.table name="film_actor">
-        <number name="actor_id" type="int" primary=""/>
-        <number name="film_id" type="int" primary=""/>
+    <db.table name="t_film_actor">
+        <number name="id" type="int" primary="" generated="by default"/>
+        <number name="actor_id" type="int"/>
+        <number name="film_id" type="int"/>
         <number name="length" type="int"/>
     </db.table>
 
-    <db.query name="films_actors">
+    <!-- <object name="result"/>
+
+    <db.query name="t_film_actor_truncate">
+        <string name="__fields__" literal="">*</string>
+        <string name="__sql__" literal="">truncate table t_film_actor</string>
+    </db.query>
+    <db.runquery name="t_film_actor_truncate" result="result"></db.runquery>
+
+    <db.query name="t_film_truncate">
+        <string name="__fields__" literal="">*</string>
+        <string name="__sql__" literal="">truncate table t_film</string>
+    </db.query>
+    <db.runquery name="t_film_truncate" result="result"></db.runquery>
+
+    <db.query name="t_actor_truncate">
+        <string name="__fields__" literal="">*</string>
+        <string name="__sql__" literal="">truncate table t_actor</string>
+    </db.query>
+    <db.runquery name="t_actor_truncate" result="result"></db.runquery> -->
+ 
+
+    <db.query name="t_films_actors">
         <number name="length_from">0</number>
         <number name="length_to">999</number>
-        <string name="__entities__">"actor film"</string>
+        <string name="__entities__">"t_actor t_film"</string>
         <string name="__sql__" literal="">
-            SELECT * FROM public.actor 
-            join film_actor on film_actor.actor_id = actor.actor_id 
-            join film on film_actor.film_id = film.film_id
-            where film.length between {{ length_from }}  and {{ length_to }}
+            SELECT * FROM public.t_actor 
+            join t_film_actor on t_film_actor.actor_id = t_actor.actor_id 
+            join t_film on t_film_actor.film_id = t_film.film_id
+            where t_film.length between {{ length_from }}  and {{ length_to }}
             -- and actor.actor_id = 2
-            ORDER BY actor.actor_id ASC ;
+            ORDER BY t_actor.actor_id ASC ;
         </string>
     </db.query>
     
@@ -49,7 +71,7 @@
         <object name="actor">actor_maria</object>
     </db.execute> -->
 
-    <db.insert table="actor" returning_into="actor_maria">
+    <db.insert table="t_actor" returning_into="actor_maria">
         <object name="actor">actor_maria</object>
     </db.insert>
 
@@ -65,7 +87,7 @@
         <object> new_film </object>
     </db.execute> -->
 
-    <db.insert table="film" returning_into="new_film">
+    <db.insert table="t_film" returning_into="new_film">
         <object>new_film</object>
     </db.insert>
 
@@ -77,7 +99,7 @@
         <object name="film"> new_film </object>
     </db.execute> -->
 
-    <db.update table="film">
+    <db.update table="t_film">
         <object name="film"> new_film </object>
     </db.update>
 
@@ -88,7 +110,7 @@
         </object>
     </db.execute> -->
 
-    <db.insert table="film_actor">
+    <db.insert table="t_film_actor">
         <object>
             <number name="actor_id">actor_maria.actor_id</number>
             <number name="film_id">new_film.film_id</number>
@@ -102,24 +124,24 @@
         <number name="length_to">60</number>
     </db.execute> -->
 
-    <db.runquery name="films_actors" result="films_actors">
+    <db.runquery name="t_films_actors" result="films_actors">
         <number name="length_from">60</number>
         <number name="length_to">60</number>
     </db.runquery>
 
-    <print>"films_actors.resultset.at(0).actor.last_name " + films_actors.resultset.at(0).actor.last_name</print>
+    <print>"films_actors.resultset.at(0).t_actor.last_name " + films_actors.resultset.at(0).t_actor.last_name</print>
     <call object="films_actors.resultset" method="foreach">
         <function>
             <object name="result" />
             <block>
-                <print>"actor " + result.actor.actor_id + " " + result.actor.first_name + " " + result.actor.last_name 
-                    + ", film " + result.film.film_id + " " + result.film.title 
+                <print>"actor " + result.t_actor.actor_id + " " + result.t_actor.first_name + " " + result.t_actor.last_name 
+                    + ", film " + result.t_film.film_id + " " + result.t_film.title 
                 </print>
             </block>
         </function>
     </call>
 
-    <print>"string(films_actors) : "+string(films_actors)</print>
+    <print>"string(films_actors.resultset) : "+string(films_actors.resultset)</print>
 
 
 </module>

package/test/db/t13.output

@@ -0,0 +1,2 @@
+index = 1
+index = 0

package/test/{t13.xml → db/t13.xml}

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <object name="films_actors" />
     <number name="index">2</number>
@@ -10,12 +10,12 @@
                 <number name="length_from">60</number>
                 <number name="length_to">60</number>
             </db.execute> -->
-            <db.runquery name="films_actors"  result="films_actors">
+            <db.runquery name="t_films_actors"  result="films_actors">
                 <number name="length_from">60</number>
                 <number name="length_to">60</number>
             </db.runquery>
             <print>"index = "+index</print>
-            <sleep>5000</sleep>
+            <sleep>500</sleep>
             
         </then>
     </while>

package/test/{t14.output → db/t14.output}

@@ -48,3 +48,5 @@ user1 <number name="user_id">
 <string name="user_appli">
 </string>
 <boolean name="user_disable">false</boolean>
+<string name="user_lang">
+</string>

package/test/{t14.xml → db/t14.xml}

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <object name="obj1">
         <string name="name">"obj1_name"</string>
@@ -73,7 +73,7 @@
 
     <print>"========= TEST OF newDBRow ======="</print>
 
-    <object name="actress">newDBRow("actor")</object>
+    <object name="actress">newDBRow("t_actor")</object>
     <print>"actress "+string(actress)</print>
 
     <object name="user1">newDBRow("cyk_user")</object>

package/test/db/t15.output

@@ -0,0 +1,4 @@
+test de if()
+2+2==4
+
+0

package/test/{t15.xml → db/t15.xml}

@@ -1,26 +1,24 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <print>"test de if()"</print>
     <print>if(2+2 == 4, "2+2==4", "2+2!==4")</print>
 
-    <db.query name="actors_by_film">
+    <db.query name="t_actors_by_film">
         <number name="film_id"/>
         <string name="__fields__">"
             film_id: number;
             actor_id: number: key;
             title: string;
-            image_uri: string;
             first_name: string;
             last_name: string
             "
         </string>
         <string name="__sql__" literal="">
-            select film.film_id, title, actor.actor_id actor_id,
-actor.image_uri,
+            select t_film.film_id, title, t_actor.actor_id actor_id,
 first_name, last_name 
-from film_actor join film on film.film_id = film_actor.film_id
-join actor on actor.actor_id = film_actor.actor_id
-where film_actor.film_id = {{ film_id }}
+from t_film_actor join t_film on t_film.film_id = t_film_actor.film_id
+join t_actor on t_actor.actor_id = t_film_actor.actor_id
+where t_film_actor.film_id = {{ film_id }}
         </string>
     </db.query>
 
@@ -30,11 +28,11 @@ where film_actor.film_id = {{ film_id }}
         <number name="film_id">103</number>
     </db.execute> -->
 
-    <db.runquery name="actors_by_film" result="actors_by_film">
+    <db.runquery name="t_actors_by_film" result="actors_by_film">
         <number name="film_id">103</number>
     </db.runquery>
 
-    <print>string(actors_by_film)</print>
+    <print>string(actors_by_film.resultset)</print>
     <print>actors_by_film.resultset.length()</print>
     <!-- <object name="films_actors"/>
     <db.execute query="films_actors" result="films_actors">

package/test/db/t16.output

@@ -0,0 +1,16 @@
+OK Février
+test IF before
+monthlabel Mars
+test IF after
+month 1 Janvier 2021 2021-01-01 -> 2021-01-31
+month 2 Février 2021 2021-02-01 -> 2021-02-28
+month 3 Mars 2021 2021-03-01 -> 2021-03-31
+month 4 Avril 2021 2021-04-01 -> 2021-04-30
+month 5 Mai 2021 2021-05-01 -> 2021-05-31
+month 6 Juin 2021 2021-06-01 -> 2021-06-30
+month 7 Juillet 2021 2021-07-01 -> 2021-07-31
+month 8 Août 2021 2021-08-01 -> 2021-08-31
+month 9 Septembre 2021 2021-09-01 -> 2021-09-30
+month 10 Octobre 2021 2021-10-01 -> 2021-10-31
+month 11 Novembre 2021 2021-11-01 -> 2021-11-30
+month 12 Décembre 2021 2021-12-01 -> 2021-12-31

package/test/{t16.xml → db/t16.xml}

@@ -1,9 +1,6 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
-    <object name="dbresult"/>
-    <!-- <db.execute select_from_table="year" result="dbresult">
-        <string name="where">"year_num = 2021"</string>
-    </db.execute> -->
+    <!-- <object name="dbresult"/>
     <db.select table="year" result="dbresult">
         <string name="where">"year_num = 2021"</string>
     </db.select>
@@ -25,7 +22,10 @@
         <else>
             <print>"TEST KO"</print>
         </else>
-    </if>
+    </if> -->
+
+    <string name="year_begin_date">"2021-01-01"</string>
+    <string name="year_end_date">"2021-12-31"</string>
 
     <object name="monthlabel">
         <string name="_01">"Janvier"</string>

package/test/{t20.xml → db/t20.xml}

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <object name="settings"/>
     <function name="__init__">

package/test/{t22.xml → db/t22.xml}

@@ -1,18 +1,18 @@
-<?xml-model href="cyklang.xsd" ?>
-<module dbname="t22">
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<module>
     <function name="get_tables" returns="result: object">
         <block>
 
-            <object name="result_setting"/>
-            <db.select table="setting" result="result_setting"/>
-            <!-- <db.execute select_from_table="setting" result="result_setting"/> -->
+            <object name="result_t_actor"/>
+            <db.select table="t_actor" result="result_t_actor"/>
+            <!-- <db.execute select_from_table="t_actor" result="result_t_actor"/> -->
 
             <object name="result_">
                 <string name="name">"CYK"</string>
                 <string name="surname">"Philippe"</string>
-                <object name="setting">result_setting.setting</object>
+                <object name="t_actor">result_t_actor.t_actor</object>
                 <object name="meta">
-                    <string name="setting">result_setting.meta.setting</string>
+                    <string name="t_actor">result_t_actor.meta.t_actor</string>
                 </object>
             </object>
             <set name="result">result_</set>

package/test/{t23.xml → db/t23.xml}

@@ -1,9 +1,9 @@
-<?xml-model href="cyklang.xsd" ?>
-<module dbname="t23">
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<module>
     <function name="call_get_tables">
         <block>
-            <object name="settings"/>
-            <db.call module="t22" method="get_tables" returns="settings"/>
+            <object name="t_actor"/>
+            <db.call module="t22" method="get_tables" returns="t_actor"/>
 
             <!-- <db.execute module="t22" method="get_tables" returns="settings">
             </db.execute> -->

package/test/t09.output

@@ -1,4 +1,4 @@
-date of birth : 1963-11-04 00:00:00 GMT+0100
+date of birth : 1963-11-04 00:00:00 GMT+0400
 french true
 150
 160

package/test/t09.xml

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="http://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <object name="dates">
         <datetime name="datebirth">datetime(&quot;11/04/1963&quot;)</datetime>