@cyklang/cli 0.7.5 → 0.8.3

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,25 +19,26 @@
         <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">
+    <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>
+    </query>
     
     <object name="actor_maria">
         <string name="first_name">"Maria" </string>
@@ -49,7 +50,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 +66,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 +78,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 +89,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 +103,24 @@
         <number name="length_to">60</number>
     </db.execute> -->
 
-    <db.runquery name="films_actors" result="films_actors">
+    <runquery name="t_films_actors" result="films_actors">
         <number name="length_from">60</number>
         <number name="length_to">60</number>
-    </db.runquery>
+    </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/db/t13.xml

@@ -0,0 +1,36 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<module>
+    <object name="films_actors" />
+    <number name="index">2</number>
+    <while>
+        <condition>index > 0</condition>
+        <then>
+            <set name="index">index - 1</set>
+            <!-- <db.execute query="films_actors" result="films_actors">
+                <number name="length_from">60</number>
+                <number name="length_to">60</number>
+            </db.execute> -->
+            <query name="t_films_actors">
+                <number name="length_from">0</number>
+                <number name="length_to">999</number>
+                <string name="__entities__">"t_actor t_film"</string>
+                <string name="__sql__" literal="">
+                    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 t_actor.actor_id ASC ;
+                </string>
+            </query>
+            <runquery name="t_films_actors"  result="films_actors">
+                <number name="length_from">60</number>
+                <number name="length_to">60</number>
+            </runquery>
+            <print>"index = "+index</print>
+            <sleep>500</sleep>
+            
+        </then>
+    </while>
+
+</module>

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="../../../../../VueProjects/docs-vuepress/docs/.vuepress/public/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,10 @@
+test de if()
+2+2==4
+<object>
+    <number name="film_id">1</number>
+    <number name="actor_id">1</number>
+    <string name="title" literal="">La mélodie du bonheur</string>
+    <string name="first_name" literal="">Maria</string>
+    <string name="last_name" literal="">CHANE YOU KAYE</string>
+</object>
+actors_by_film.resultset.length(): 1

package/test/db/t15.xml

@@ -0,0 +1,47 @@
+<?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>
+
+    <query name="t_actors_by_film">
+        <object name="params">
+            <number name="film_id">150</number>
+        </object>
+        <string name="fields">"
+            film_id: number;
+            actor_id: number: key;
+            title: string;
+            first_name: string;
+            last_name: string
+            "
+        </string>
+        <string name="sql" literal="">
+            select t_film.film_id, title, t_actor.actor_id actor_id,
+first_name, last_name
+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>
+    </query>
+
+    <object name="actors_by_film"/>
+
+    <!-- <db.execute query="actors_by_film" result="actors_by_film">
+        <number name="film_id">103</number>
+    </db.execute> -->
+
+    <runquery name="t_actors_by_film" result="actors_by_film">
+        <number name="film_id">1</number>
+    </runquery>
+
+    <print>string(actors_by_film.resultset)</print>
+    <print>"actors_by_film.resultset.length(): " + actors_by_film.resultset.length()</print>
+    <!-- <object name="films_actors"/>
+    <db.execute query="films_actors" result="films_actors">
+        <number name="length_from">60</number>
+        <number name="length_to">60</number>
+    </db.execute>
+    <print>"============= films_actors =========="</print>
+    <print>string(films_actors)</print> -->
+
+</module>

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/db/test_schema.xml

@@ -0,0 +1,15 @@
+<?xml-model href="./schema.xsd"?>
+<object>
+    <query name="q1">
+        <object name="params">
+            <number name="n"/>
+            
+        </object>
+        <string name="sql" literal="">select * from table</string>
+    </query>
+    <number name="n1"/>
+    <string name="s1"/>
+    <object name="o1">
+        <number name="n2"/>
+    </object>
+</object>

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>

package/test/t27.output

@@ -1,2 +1,4 @@
 150
 {"user_id":1,"user_name":"cyk","user_email":"cyk@gmail.com","user_password":"$2b$10$Et1b0DodTNKxW/jvUFC8be8JrRXULHWC5RnwOjVhUXmVKv.CyfFW.","user_access":"admin","user_appli":null,"user_disable":false,"user_lang":null}
+Paris coordinates : <number name="lon">2.3488</number>
+<number name="lat">48.8534</number>

package/test/t27.xml

@@ -1,4 +1,4 @@
-<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<?xml-model href="../../../../VueProjects/docs-vuepress/docs/.vuepress/public/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <module>
     <print>objson('150')</print>
     <string name="chaine" literal=""><![CDATA[ 
@@ -15,4 +15,25 @@
         ]]>
     </string>
     <print>json(objson(chaine))</print>
+
+    <object name="resp"/>
+
+    <fetch method="get" returns="resp" >
+        <string name="origin">"https://api.openweathermap.org"</string>
+        <string name="pathname">"/data/2.5/weather"</string>
+        <object name="search">
+            <string name="q">"paris,fr"</string>
+            <string name="units">"metric"</string>
+            <string name="lang">"fr"</string>
+            <string name="APPID">env("OPENWEATHER_API_KEY")</string>
+        </object>
+    </fetch>
+    <print>'Paris coordinates : ' + string(resp.json.coord)</print>
+<!-- 
+    <print>"icon: " + resp.json.weather.at(0).icon 
+        + ", description: " 
+        + resp.json.weather.at(0).description 
+        + ", temp: " + resp.json.main.temp + "°C"
+    </print> -->
+
 </module>

package/build/TableData.d.ts

@@ -1,5 +0,0 @@
-import { Cmd } from "./Cmd";
-export declare class TableDataCommand extends Cmd {
-    constructor(name: string, description: string);
-    commandData(table: string, options: any): Promise<void>;
-}

package/build/TableData.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableDataCommand = void 0;
-const Cmd_1 = require("./Cmd");
-const DBClient_1 = require("./DBClient");
-const TableCommand_1 = require("./TableCommand");
-//--------------------------------------------------------------------------------------------------------------------
-// class TableData
-//--------------------------------------------------------------------------------------------------------------------
-class TableDataCommand extends Cmd_1.Cmd {
-    constructor(name, description) {
-        super(name);
-        this.description(description)
-            .argument('<table>', 'table name')
-            .option('--where <clause_where_sql>', 'criteria in SQL syntax')
-            .option('-s --sort <columns>', 'sort by columns positions (begins by 0) separated by comma')
-            .option('-w --width <colwidth>', 'columns widths separated by comma')
-            .action(async (table, options) => {
-            this.commandData(table, options);
-        });
-    }
-    async commandData(table, options) {
-        try {
-            await this.prologue(options);
-            if (this.dbManager === undefined)
-                throw 'dbManager undefined';
-            const dbTable = await this.dbManager.dbTableExist(table);
-            if (dbTable === undefined)
-                throw 'table ' + table + ' not found';
-            let fields = '';
-            for (let ind = 0; ind < dbTable.columns.length; ind++) {
-                const dbColumn = dbTable.columns[ind];
-                let ok = false;
-                let fieldName = dbColumn.name;
-                if (dbColumn.dbType === 'text' || dbColumn.dbType === 'bytea') {
-                    ok = false;
-                    fieldName = 'length(' + dbColumn.name + ')';
-                }
-                else {
-                    ok = true;
-                }
-                if (ok === true) {
-                    if (fields !== '')
-                        fields += ',';
-                    fields += fieldName;
-                }
-            }
-            TableCommand_1.logger.debug('commandQuery', table);
-            const dbClient = new DBClient_1.DBClient(this.dbManager);
-            let title = 'Table ' + table;
-            if (options.where !== undefined) {
-                title += ' where ' + options.where;
-            }
-            dbClient.selectFromTable(title, table, { fields: fields, width: options.width, sort: options.sort || '1', where: options.where });
-        }
-        catch (err) {
-            TableCommand_1.logger.error(err);
-        }
-    }
-}
-exports.TableDataCommand = TableDataCommand;

package/build/TestCommand copy.d.ts

@@ -1,5 +0,0 @@
-import { Cmd } from "./Cmd";
-export declare class TestCommand extends Cmd {
-    constructor();
-    testRun(files: string[], options: any): Promise<void>;
-}

package/build/TestCommand copy.js

@@ -1,111 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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.TestCommand = void 0;
-const core_1 = require("@cyklang/core");
-const fs = __importStar(require("fs"));
-const console_1 = require("./console");
-const loglevel_1 = __importDefault(require("loglevel"));
-const NodeCrypto_1 = require("./NodeCrypto");
-const Cmd_1 = require("./Cmd");
-loglevel_1.default.setLevel('debug');
-const logger = loglevel_1.default.getLogger('TestCommand.ts');
-class TestCommand extends Cmd_1.Cmd {
-    constructor() {
-        super('test');
-        this.description('test script').version('0.1')
-            .argument('<files...>', 'local module file(s) to test run')
-            .action(async (files, options) => {
-            await this.testRun(files, options);
-        });
-    }
-    async testRun(files, options) {
-        try {
-            await this.prologue(options);
-            for (let ind = 0; ind < files.length; ind++) {
-                const result = await testfile(files[ind]);
-                if (result === false) {
-                    logger.debug('*********** FAILURE ' + process.argv[ind] + ' ***************');
-                }
-            }
-        }
-        catch (err) {
-            logger.error(err);
-        }
-    }
-}
-exports.TestCommand = TestCommand;
-async function testfile(filename) {
-    let result;
-    if (filename.indexOf(".") !== -1) {
-        filename = filename.substring(0, filename.indexOf("."));
-    }
-    let xmlfilename = filename + ".xml";
-    let logfilename = filename + ".log";
-    let outfilename = filename + ".output";
-    let xml = fs.readFileSync(xmlfilename);
-    fs.writeFileSync(logfilename, "");
-    //console.log(xml.toString())
-    try {
-        if (process.env.DBREMOTE_URL === undefined)
-            throw 'DBREMOTE_URL undefined';
-        logger.trace('DBREMOTE_URL ' + process.env.DBREMOTE_URL);
-        const structure = new core_1.Structure();
-        const nodeCrypto = new NodeCrypto_1.NodeCrypto();
-        const dbRemote = new core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto);
-        const login = await dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);
-        //const dbRemote = new DBRemote(structure, 'https://cyk-postgres.herokuapp.com')
-        const dbManager = new core_1.DBManager(structure.scope, dbRemote);
-        await dbManager.initialize();
-        structure.scope.addInstructionType(new console_1.PrintInstructionType(logfilename));
-        let script = new core_1.Script(structure.scope, xmlfilename, xml.toString());
-        await script.parseInstructions();
-        await script.execute();
-        // console.log(JSON.stringify(script.block.toString()))
-    }
-    catch (err) {
-        if (err instanceof core_1.XmlError) {
-            let xmlError = err;
-            (0, console_1.errorconsole)(xmlError);
-        }
-        console.log(err);
-    }
-    let log = fs.readFileSync(logfilename);
-    if (fs.existsSync(outfilename) === true) {
-        let out = fs.readFileSync(outfilename);
-        if (log.toString() === out.toString()) {
-            console.log("test " + xmlfilename + " SUCCESS");
-            result = true;
-        }
-        else {
-            console.log("test " + xmlfilename + " FAILURE");
-            result = false;
-        }
-    }
-    else {
-        console.log("test " + xmlfilename + " output file not found ");
-        result = false;
-    }
-    return result;
-}

package/build/cykquery.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env ts-node
-export {};