@cyklang/cli 0.7.5 → 0.8.3

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

package/build/module.js

@@ -1,290 +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 core_1 = require("@cyklang/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 commander_1 = require("commander");
-const NodeCrypto_1 = require("./NodeCrypto");
-const logger = loglevel_1.default.getLogger("cykmodule.ts");
-logger.setLevel("debug");
-const program = new commander_1.Command();
-program.name('cyk').description('manage modules in cyk_module table')
-    .version('0.2');
-program.command('add').description('add modules')
-    .argument('<files...>', 'local module file(s) to upload to the server')
-    .option('-n --name <dbname>', 'module dbname')
-    .option('-d --desc <description>', 'description')
-    .option('-a --access <access>', 'access control list')
-    .option('-e --env <env>', 'path to the environment variables file')
-    .action(async (files, options) => {
-    await commandAdd(files, options);
-});
-program.command('update').description('update module')
-    .option('-i --id <id>', 'module ID')
-    .option('-n --name <dbname>', 'module dbname')
-    .option('-d --desc <description>', 'description')
-    .option('-a --access <access>', 'access control list')
-    .option('-e --env <env>', 'path to the environment variables file')
-    .argument('[files...]', 'local module file(s) to upload to the server')
-    .action(async (files, options) => {
-    await commandUpdate(files, options);
-});
-program.command('run').description('execute/run a local module file')
-    .argument('<file>', 'local module file to run')
-    .option('-e --env <env>', 'path to the environment variables file')
-    .action(async (file, options) => {
-    await commandRun(file, options);
-});
-const getDBManager = async () => {
-    const structure = new core_1.Structure();
-    if (process.env.DBREMOTE_URL === undefined)
-        throw 'DBREMOTE_URL undefined';
-    logger.debug('DBREMOTE_URL ' + process.env.DBREMOTE_URL);
-    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);
-    // logger.debug(login)
-    const dbManager = new core_1.DBManager(structure.scope, dbRemote);
-    await dbManager.initialize();
-    return dbManager;
-};
-const commandAdd = async (files, options) => {
-    // logger.debug('options : ', options, ', files : ', files)
-    try {
-        const dotenvOutput = dotenv_1.default.config({ path: options.env });
-        if (dotenvOutput.error !== undefined)
-            throw dotenvOutput.error;
-        const dbManager = await getDBManager();
-        if (options.id !== undefined)
-            throw '--id option is not available';
-        if (files.length === 0)
-            throw 'file(s) name(s) missing';
-        if (files.length > 1 && (options.name !== undefined))
-            throw '--name option cannot be specified with more than 1 file';
-        for (let ind = 0; ind < files.length; ind++) {
-            const file = files[ind];
-            const dbModule = new core_1.DBModule();
-            dbModule.source = fs.readFileSync(file).toString();
-            dbModule.dbname = path_1.default.basename(file, '.xml');
-            if (options.name !== undefined)
-                dbModule.dbname = options.name;
-            if (options.desc !== undefined)
-                dbModule.description = options.desc;
-            if (options.access !== undefined)
-                dbModule.access = options.access;
-            const moduleExist = await dbManager.dbModuleExist(dbModule.dbname);
-            if (moduleExist !== undefined)
-                throw 'module ' + moduleExist.dbname + ' already exists with id ' + moduleExist.id;
-            const id = await dbManager.dbModuleInsert(dbModule);
-            logger.info('module ' + dbModule.dbname + ' added with id ' + id);
-        }
-    }
-    catch (err) {
-        logger.error(err);
-    }
-};
-const commandUpdate = async (files, options) => {
-    // logger.debug('files : ', files, ', options : ', options)
-    try {
-        const dotenvOutput = dotenv_1.default.config({ path: options.env });
-        if (dotenvOutput.error !== undefined)
-            throw dotenvOutput.error;
-        const dbManager = await getDBManager();
-        if (options.id !== undefined) {
-            if (files.length > 1)
-                throw 'with --id option you can only specify 1 local file';
-            const dbModule = await dbManager.getModule(options.id);
-            if (options.name !== undefined)
-                dbModule.dbname = options.name;
-            if (options.desc !== undefined)
-                dbModule.description = options.desc;
-            if (options.access !== undefined)
-                dbModule.access = options.access;
-            if (files.length === 1) {
-                dbModule.source = fs.readFileSync(files[0]).toString();
-            }
-            await dbManager.dbModuleUpdate(dbModule);
-        }
-        else {
-            if (files.length === 0)
-                throw 'without --id option you need to specify at least 1 local file';
-            for (let ind = 0; ind < files.length; ind++) {
-                const file = files[ind];
-                const dbname = path_1.default.basename(file, '.xml');
-                const dbModule = await dbManager.dbModuleExist(dbname);
-                if (dbModule === undefined) {
-                    logger.info('local file ' + file + ', module ' + dbname + ' not found');
-                    continue;
-                }
-                dbModule.source = fs.readFileSync(file).toString();
-                logger.debug('dbModule update from ' + file);
-                if (options.desc !== undefined)
-                    dbModule.description = options.desc;
-                if (options.access !== undefined)
-                    dbModule.access = options.access;
-                await dbManager.dbModuleUpdate(dbModule);
-            }
-        }
-    }
-    catch (err) {
-        logger.error(err);
-    }
-};
-const commandRun = async (file, options) => {
-    try {
-        logger.debug('options', options);
-        const dotenvOutput = dotenv_1.default.config({ path: options.env });
-        if (dotenvOutput.error !== undefined)
-            throw dotenvOutput.error;
-        const dbManager = await getDBManager();
-        const source = fs.readFileSync(file).toString();
-        const tag = (0, core_1.parseXML)(file, source);
-        const moduleInstruction = new core_1.ModuleInstruction(tag, dbManager);
-        const scopeRun = new core_1.Scope(dbManager.scope.structure, dbManager.scope, undefined);
-        await moduleInstruction.parseInstructions(tag, scopeRun);
-        await moduleInstruction.execute(scopeRun);
-    }
-    catch (err) {
-        logger.error(err);
-    }
-};
-program.parse();
-// const main = async () => {
-//     const { command, filepath, basename } = parseCommandLine()
-//     const xmlSource = fs.readFileSync(filepath).toString()
-//     let dbModule: DBModule | undefined
-//     let tag = parseXmlFile(filepath, basename, xmlSource)
-//     if (command === Command.Test || command === Command.TestSave) {
-//         dbModule = await testXml(structure, tag)
-//     }
-//     else if (command === Command.Save) {
-//         dbModule = await dbManager.dbModuleExist(tag.attributes.DBNAME)
-//         if (dbModule === undefined) {
-//             dbModule = new DBModule(tag.attributes.DBNAME)
-//         }
-//     }
-//     if (dbModule !== undefined && (command === Command.Save || command === Command.TestSave)) {
-//         dbModule.source = xmlSource
-//         await saveModule(dbManager, dbModule)
-//     }
-// }
-// main().then(() => logger.debug('finished'))
-// enum Command {
-//     Test = 'test',
-//     Save = 'save',
-//     TestSave = 'testsave'
-// }
-// function syntax() {
-//     console.log(`
-//     ----------------------------------------------------------------------------------
-//     cykmodule writes a module file to the server (DBREMOTE_URL environment variable)
-//     syntax :
-//     cykmodule [ save | test | testsave ] filename
-//     cykmodule filename ( option testsave if omitted )
-//     ----------------------------------------------------------------------------------
-//     `)
-// }
-// function parseCommandLine(): { command: Command, filepath: string, basename: string } {
-//     let command = Command.TestSave
-//     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.TestSave
-//     }
-//     else {
-//         const option = process.argv[2].toLowerCase()
-//         if ( option === 'test' || option === 'save' || option === 'testsave') {
-//             command = <Command> option
-//         }
-//         else {
-//             syntax()
-//             throw Error('command unknown ' + process.argv[2])
-//         }
-//         filepath = process.argv[3]
-//     }
-//     logger.trace('dbmodule filepath : ' + filepath)
-//     const basename = path.basename(filepath)
-//     const extname = path.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, core_1.parseXML)(filepath, xmlSource);
-    if (tag.name !== 'MODULE') {
-        throw Error('tag ' + tag.name + ', should be <module>');
-    }
-    const dbname = tag.attributes.DBNAME;
-    // if (dbname === undefined) {
-    //     throw Error('dbname attribute is missing')
-    // }
-    if (dbname !== undefined && basename !== dbname + '.xml') {
-        throw Error('filename ' + filepath + ' and dbname ' + dbname + ' do not correspond');
-    }
-    return tag;
-}
-async function testXml(structure, tag) {
-    let result;
-    try {
-        logger.debug('testXml dbname : ' + tag.attributes.DBNAME);
-        // structure.setInstructionType("print", new PrintInstructionType(logfilename))
-        const moduleInstructionType = structure.scope.getInstructionType('module');
-        if (moduleInstructionType === undefined) {
-            throw Error('moduleInstructionType not found');
-        }
-        const scopeParse = new core_1.Scope(structure, structure.scope, undefined);
-        const moduleInst = await moduleInstructionType.parseInstruction(tag, scopeParse);
-        const scopeExecute = new core_1.Scope(structure, structure.scope, undefined);
-        await moduleInst.execute(scopeExecute);
-        result = moduleInst.dbModule;
-        // if (result === undefined) {
-        //     throw Error('moduleInst.dbModule undefined')
-        // }
-    }
-    catch (err) {
-        logger.error(err);
-    }
-    return result;
-}
-async function saveModule(dbManager, dbModule) {
-    logger.debug('saveModule ' + dbModule.dbname + ', description ; ' + dbModule.description);
-    if (dbModule.id === undefined) {
-        // dbModuleInsert
-        await dbManager.dbModuleInsert(dbModule);
-    }
-    else {
-        // dbModuleUpdate
-        await dbManager.dbModuleUpdate(dbModule);
-    }
-}