@cyklang/cli 0.8.0 → 0.8.3

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

package/build/cyktable.js

@@ -1,133 +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 dotenv_1 = __importDefault(require("dotenv"));
-const commander_1 = require("commander");
-const child_process_1 = require("child_process");
-const logger = loglevel_1.default.getLogger("cyktable.ts");
-logger.setLevel("debug");
-const program = new commander_1.Command();
-program.name('cyktable').description('import/export table rows')
-    .version('0.2');
-program.command('export').description('export to CSV file(s)')
-    .argument('<tables...>', 'table(s) to export')
-    .option('-e --env <env>', 'path to the environment variables file')
-    .option('-f --file <file>', 'name of the file to create, defaults to <table_name>.csv')
-    .option('-d --dir <directory>', 'name of the directory where to create exported files')
-    .action(async (tables, options) => commandImportExport('to', tables, options));
-program.command('import').description('export to CSV file(s)')
-    .argument('<tables...>', 'table(s) to export')
-    .option('-e --env <env>', 'path to the environment variables file')
-    .option('-f --file <file>', 'name of the file to create, defaults to <table_name>.csv')
-    .option('-d --dir <directory>', 'name of the directory where to create exported files')
-    .action(async (tables, options) => commandImportExport('from', tables, options));
-const getDBManager = 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();
-    return dbManager;
-};
-const commandImportExport = async (direction, tables, options) => {
-    logger.debug('tables : ', tables, 'options : ', options);
-    try {
-        const dotenvOutput = dotenv_1.default.config({ path: options.env });
-        if (dotenvOutput.error !== undefined)
-            throw dotenvOutput.error;
-        if (options.file === undefined && options.dir === undefined)
-            throw '--file or --dir mandatory';
-        if (options.file !== undefined && options.dir !== undefined)
-            throw '--file and --dir are mutually exclusive';
-        if (tables.length === 0)
-            throw 'at least one table name is mandatory';
-        if (tables.length > 1 && options.dir === undefined)
-            throw 'for multiple tables, --dir is mandatory';
-        const dbManager = await getDBManager();
-        for (let indi = 0; indi < tables.length; indi++) {
-            const tableName = tables[indi];
-            const dbTable = await dbManager.dbTableExist(tableName);
-            if (dbTable === undefined) {
-                logger.info('table ' + tableName + ' not found');
-                continue;
-            }
-            let lcols;
-            for (let indj = 0; indj < dbTable.columns.length; indj++) {
-                const dbColumn = dbTable.columns[indj];
-                if (lcols === undefined) {
-                    lcols = "(";
-                }
-                else {
-                    lcols += ",";
-                }
-                lcols += dbColumn.name;
-            }
-            lcols += ")";
-            let psql_cmd = "psql -c";
-            if (process.env.HEROKU_CLI !== undefined) {
-                psql_cmd = process.env.HEROKU_CLI + ' -c ';
-            }
-            let filename;
-            if (options.file !== undefined) {
-                if (fs.existsSync(options.file) && fs.lstatSync(options.file).isDirectory())
-                    throw '--file ' + options.file + ' is a directory';
-                filename = options.file;
-            }
-            else if (options.dir === undefined)
-                throw '--file and --dir unspecified';
-            else if (fs.existsSync(options.dir) === false)
-                throw 'directory ' + options.dir + ' does not exist';
-            else if (fs.lstatSync(options.dir).isFile()) {
-                logger.debug("--dir " + options.dir + " is a file ");
-            }
-            else {
-                let directory = options.dir.trim();
-                if (directory[directory.length - 1] !== '/') {
-                    directory += '/';
-                }
-                filename = directory + tableName + '.csv';
-            }
-            let copy_cmd = "\\copy " + tableName + lcols + direction + " '" + filename + "' csv header";
-            const shell_cmd = psql_cmd + '"' + copy_cmd + '"';
-            logger.debug(shell_cmd);
-            const child = (0, child_process_1.spawn)(shell_cmd.trim(), { stdio: 'inherit', shell: true });
-            // exec(shell_cmd.trim(), (error, stdout, stderr) => {
-            //     if (error) throw error
-            //     logger.debug(stdout, stderr)
-            // })
-        }
-    }
-    catch (err) {
-        logger.error(err);
-    }
-};
-program.parse();

package/build/module.d.ts

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