@cyklang/cli 0.8.0 → 0.9.0

package/test/db/t10.xml

@@ -26,28 +26,7 @@
         <number name="length" type="int"/>
     </db.table>
 
-    <!-- <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">
+    <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>
@@ -59,7 +38,7 @@
             -- and actor.actor_id = 2
             ORDER BY t_actor.actor_id ASC ;
         </string>
-    </db.query>
+    </query>
     
     <object name="actor_maria">
         <string name="first_name">"Maria" </string>
@@ -124,10 +103,10 @@
         <number name="length_to">60</number>
     </db.execute> -->
 
-    <db.runquery name="t_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).t_actor.last_name " + films_actors.resultset.at(0).t_actor.last_name</print>
     <call object="films_actors.resultset" method="foreach">

package/test/db/t13.xml

@@ -10,10 +10,23 @@
                 <number name="length_from">60</number>
                 <number name="length_to">60</number>
             </db.execute> -->
-            <db.runquery name="t_films_actors"  result="films_actors">
+            <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>
-            </db.runquery>
+            </runquery>
             <print>"index = "+index</print>
             <sleep>500</sleep>
             

package/test/db/t14.xml

@@ -1,4 +1,4 @@
-<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<?xml-model href="../../../../../VueProjects/docs-vuepress/docs/.vuepress/public/cyklang.xsd" ?>
 <module>
     <object name="obj1">
         <string name="name">"obj1_name"</string>

package/test/db/t15.output

@@ -1,4 +1,10 @@
 test de if()
 2+2==4
-
-0
+<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

@@ -3,9 +3,11 @@
     <print>"test de if()"</print>
     <print>if(2+2 == 4, "2+2==4", "2+2!==4")</print>
 
-    <db.query name="t_actors_by_film">
-        <number name="film_id"/>
-        <string name="__fields__">"
+    <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;
@@ -13,14 +15,14 @@
             last_name: string
             "
         </string>
-        <string name="__sql__" literal="">
+        <string name="sql" literal="">
             select t_film.film_id, title, t_actor.actor_id actor_id,
-first_name, last_name 
+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>
-    </db.query>
+    </query>
 
     <object name="actors_by_film"/>
 
@@ -28,12 +30,12 @@ where t_film_actor.film_id = {{ film_id }}
         <number name="film_id">103</number>
     </db.execute> -->
 
-    <db.runquery name="t_actors_by_film" result="actors_by_film">
-        <number name="film_id">103</number>
-    </db.runquery>
+    <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()</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>

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/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 {};

package/build/cykquery.js

@@ -1,145 +0,0 @@
-#!/usr/bin/env ts-node
-"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 });
-const cyk_core_1 = require("@cyk-language/cyk-core");
-const fs = __importStar(require("fs"));
-const loglevel_1 = __importDefault(require("loglevel"));
-const path_1 = __importDefault(require("path"));
-const dotenv_1 = __importDefault(require("dotenv"));
-const logger = loglevel_1.default.getLogger("model.ts");
-logger.setLevel("debug");
-dotenv_1.default.config();
-const main = async () => {
-    const structure = new cyk_core_1.Structure();
-    if (process.env.DBREMOTE_URL === undefined)
-        throw 'DBREMOTE_URL undefined';
-    logger.debug('DBREMOTE_URL ' + process.env.DBREMOTE_URL);
-    const dbRemote = new cyk_core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL);
-    const login = await dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);
-    logger.debug(login);
-    const dbManager = new cyk_core_1.DBManager(structure.scope, dbRemote);
-    await dbManager.initialize();
-    const { command, filepath, basename } = parseCommandLine();
-    const xmlSource = fs.readFileSync(filepath).toString();
-    let tag = parseXmlFile(filepath, basename, xmlSource);
-    if (command === Command.Exec || command === Command.ExecTest) {
-        await executeXml(structure, tag, xmlSource);
-    }
-    if (command === Command.Test || command === Command.ExecTest) {
-        await testQuery(structure, tag.attributes.NAME);
-    }
-};
-main().then(() => logger.debug('finished'));
-var Command;
-(function (Command) {
-    Command["Exec"] = "exec";
-    Command["ExecTest"] = "exectest";
-    Command["Test"] = "test";
-})(Command || (Command = {}));
-function syntax() {
-    console.log(`
-    ----------------------------------------------------------------------------------
-    cykquery executes a <db.query> to the server (DBREMOTE_URL environment variable)
-    syntax :
-    cykquery [ exec | test | exectest ] filename
-    cykquery filename (option exectest by default)
-    ----------------------------------------------------------------------------------
-    `);
-}
-function parseCommandLine() {
-    let command;
-    let filepath;
-    if (process.argv.length < 3 || process.argv.length > 4) {
-        syntax();
-        throw Error('nb of command line arguments : ' + process.argv.length);
-    }
-    if (process.argv.length === 3) {
-        filepath = process.argv[2];
-        command = Command.ExecTest;
-    }
-    else {
-        const option = process.argv[2].toLowerCase();
-        if (option === 'test' || option === 'exec' || option === 'exectest') {
-            command = option;
-        }
-        else {
-            syntax();
-            throw Error('command unknown ' + process.argv[2]);
-        }
-        filepath = process.argv[3];
-    }
-    logger.trace('cykquery filepath : ' + filepath);
-    const basename = path_1.default.basename(filepath);
-    const extname = path_1.default.extname(filepath);
-    logger.trace('basename ' + basename + ', extname ' + extname);
-    if (extname.toLowerCase() !== '.xml') {
-        throw Error('filepath argument ' + filepath + ' should have xml extension');
-    }
-    return { command, filepath, basename };
-}
-function parseXmlFile(filepath, basename, xmlSource) {
-    const tag = (0, cyk_core_1.parseXML)(filepath, xmlSource);
-    if (tag.name !== 'DB.QUERY') {
-        throw Error('tag ' + tag.name + ', should be <db.query>');
-    }
-    const name = tag.attributes.NAME;
-    if (name === undefined) {
-        throw Error('name attribute is missing');
-    }
-    if (basename !== name + '.xml') {
-        throw Error('filename ' + filepath + ' and name ' + name + ' do not correspond');
-    }
-    return tag;
-}
-async function executeXml(structure, tag, xmlSource) {
-    try {
-        logger.debug('executeXml ' + tag.attributes.NAME);
-        // structure.setInstructionType("print", new PrintInstructionType(logfilename))
-        const dbQueryInstructionType = structure.scope.getInstructionType('db.query');
-        if (dbQueryInstructionType === undefined) {
-            throw Error('dbQueryInstructionType not found');
-        }
-        const scopeParse = new cyk_core_1.Scope(structure, structure.scope, undefined);
-        const dbQueryInst = await dbQueryInstructionType.parseInstruction(tag, scopeParse);
-        dbQueryInst.source = xmlSource;
-        const scopeExecute = new cyk_core_1.Scope(structure, structure.scope, undefined);
-        await dbQueryInst.execute(scopeExecute);
-    }
-    catch (err) {
-        logger.error(err);
-    }
-}
-async function testQuery(structure, queryName) {
-    const xmlScript = `
-    <block>
-    <object name='result'/>
-    <db.execute query='${queryName}' result='result' />
-    <print>string(result)</print>
-    </block>
-    `;
-    const script = new cyk_core_1.Script(structure.scope, 'test', xmlScript);
-    await script.parseInstructions();
-    await script.execute();
-}

package/build/cyktable.d.ts

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