@cyklang/cli 0.8.0 → 0.8.3

package/build/CronCommand.d.ts

@@ -0,0 +1,4 @@
+import { Command } from "commander";
+export declare class CronCommand extends Command {
+    constructor(name: string);
+}

package/build/CronCommand.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CronCommand = void 0;
+const commander_1 = require("commander");
+const loglevel_1 = __importDefault(require("loglevel"));
+const Cmd_1 = require("./Cmd");
+const logger = loglevel_1.default.getLogger('CronCommand.ts');
+logger.setLevel('debug');
+class CronCommand extends commander_1.Command {
+    constructor(name) {
+        super(name);
+        this.description('batch scheduling with cron')
+            .addCommand(new CronList('list'))
+            .addCommand(new CronList('l'))
+            .addCommand(new CronAddCmd('add'))
+            .addCommand(new CronAddCmd('a'));
+    }
+}
+exports.CronCommand = CronCommand;
+class CronList extends Cmd_1.Cmd {
+    constructor(name) {
+        super(name);
+        this.description('List scheduled batches')
+            .action(async (options) => {
+        });
+    }
+}
+class CronAddCmd extends Cmd_1.Cmd {
+    constructor(name) {
+        super(name);
+        this.description('add a batch scheduling with cron')
+            .option('-s --schedule <schedule>', 'schedule in crontab format')
+            .option('-m --module <module_name>', 'module name')
+            .option('-f --function <function>', 'function called in the module')
+            .option('-p --param <parameter_name_value>', 'name and value separated by = character')
+            .action(async (options) => {
+            console.log('options', options);
+        });
+    }
+}

package/build/QueryCommand.js

@@ -9,6 +9,7 @@ const loglevel_1 = __importDefault(require("loglevel"));
 const Cmd_1 = require("./Cmd");
 const commander_1 = require("commander");
 const DBClient_1 = require("./DBClient");
+const inquirer_1 = __importDefault(require("inquirer"));
 const logger = loglevel_1.default.getLogger("QueryCommand.ts");
 logger.setLevel("debug");
 class QueryCommand extends commander_1.Command {
@@ -17,6 +18,7 @@ class QueryCommand extends commander_1.Command {
         this.description('query management');
         this.addCommand(new QueryList('list', 'list queries'));
         this.addCommand(new QueryList('l', 'list queries'));
+        this.addCommand(new QueryDelete('delete'));
     }
 }
 exports.QueryCommand = QueryCommand;
@@ -40,6 +42,46 @@ class QueryList extends Cmd_1.Cmd {
         dbClient.selectFromTable('List of Queries', 'cyk_query', { fields: 'query_id,query_name,query_auth,query_access,query_description', sort: options.sort || '1' });
     }
 }
+/**
+ * class QueryDelete
+ */
+class QueryDelete extends Cmd_1.Cmd {
+    constructor(name) {
+        super(name);
+        this.description('delete query from cyk_query table')
+            .option('-y --yes', 'confirmation is not required')
+            .argument('<query>', 'query name')
+            .action(async (query, options) => {
+            await this.commandDelete(query, options);
+        });
+    }
+    async commandDelete(query, options) {
+        try {
+            await this.prologue(options);
+            if (!this.dbManager)
+                throw 'dbManager undefined';
+            const dbQuery = await this.dbManager.dbQueryExist(query);
+            if (!dbQuery) {
+                console.log('query ' + query + ' does not exist ');
+                return;
+            }
+            let deleteConfirmed = (options.yes !== undefined);
+            if (deleteConfirmed === false) {
+                const reply = await inquirer_1.default.prompt({ type: 'confirm', name: 'confirm', message: 'Delete query ' + query + '?' });
+                if (reply.confirm) {
+                    deleteConfirmed = true;
+                }
+            }
+            if (deleteConfirmed) {
+                await this.dbManager.dbQueryDelete(dbQuery);
+                console.log('Query ' + query + ' has been deleted');
+            }
+        }
+        catch (err) {
+            logger.error(err);
+        }
+    }
+}
 //--------------------------------------------------------------------------------------------------------------------
 // class queryData
 //--------------------------------------------------------------------------------------------------------------------

package/build/TestCommand.js

@@ -112,7 +112,8 @@ async function testfile(filename) {
             let xmlError = err;
             (0, console_1.errorconsole)(xmlError);
         }
-        console.log(err);
+        else
+            console.log(err);
     }
     let log = fs.readFileSync(logfilename);
     if (fs.existsSync(outfilename) === true) {

package/build/console.js

@@ -41,6 +41,7 @@ function errorconsole(xmlError) {
             msg += ":" + (xmlError.tag.column + 1);
         }
         msg += ") ===============\n";
+        msg += xmlError.message;
         console.log(msg);
     }
 }

package/build/index.js

@@ -43,6 +43,7 @@ const TableDataCommand_1 = require("./TableDataCommand");
 const TestCommand_1 = require("./TestCommand");
 const UninstallCommand_1 = require("./UninstallCommand");
 const UserCommand_1 = require("./UserCommand");
+const CronCommand_1 = require("./CronCommand");
 const logger = loglevel_1.default.getLogger("index.ts");
 logger.setLevel("debug");
 /**
@@ -181,7 +182,7 @@ class StopCommand extends commander_1.Command {
  */
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.5');
+    .version('0.8.3');
 program.addCommand(new StartCommand('start'));
 program.addCommand(new StopCommand('stop'));
 program.addCommand(new InstallCommand_1.InstallCommand('install'));
@@ -204,4 +205,6 @@ program.addCommand(new RunCommand_1.RunCommand('run'));
 program.addCommand(new RunCommand_1.RunCommand('r'));
 program.addCommand(new OpenCommand_1.OpenCommand('open'));
 program.addCommand(new OpenCommand_1.OpenCommand('o'));
+program.addCommand(new CronCommand_1.CronCommand('cron'));
+program.addCommand(new CronCommand_1.CronCommand('c'));
 program.parse();

package/clean_test.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cyk table drop -y t_film_actor
+cyk table drop -y t_film
+cyk table drop -y t_actor
+
+
+psql -c "
+do \$\$
+declare next_id int;
+begin
+select max(table_id)+1 from cyk_table into next_id;
+execute 'alter sequence cyk_table_table_id_seq restart with ' || next_id ;
+end \$\$
+"
+
+
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.8.0",
+   "version": "0.8.3",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -11,13 +11,13 @@
       "npm:upgrade": "npx npm-check-updates -iu",
       "refresh": "rm -rf ./node_modules ./package-lock.json && npm install",
       "dev": "nodemon -e ts --ignore build --exec \"npm run global\" ",
-      "test": "cyk test test/t*.xml"
+      "test": "./run_test.sh"
    },
    "keywords": [],
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.5.4",
+      "@cyklang/core": "^0.6.2",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/run_test.sh

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

package/src/CronCommand.ts

@@ -0,0 +1,40 @@
+import { Command } from "commander";
+import loglevel from 'loglevel'
+import { Cmd } from "./Cmd";
+const logger = loglevel.getLogger('CronCommand.ts')
+logger.setLevel('debug')
+
+export class CronCommand extends Command {
+    constructor(name: string) {
+        super(name)
+        this.description('batch scheduling with cron')
+        .addCommand(new CronList('list'))
+        .addCommand(new CronList('l'))
+        .addCommand(new CronAddCmd('add'))
+        .addCommand(new CronAddCmd('a'))
+    }
+}
+
+class CronList extends Cmd {
+    constructor(name: string) {
+        super(name)
+        this.description('List scheduled batches')
+            .action(async (options: any) => {
+
+            })
+    }
+}
+
+class CronAddCmd extends Cmd {
+    constructor(name: string) {
+        super(name)
+        this.description('add a batch scheduling with cron')
+            .option('-s --schedule <schedule>', 'schedule in crontab format')
+            .option('-m --module <module_name>', 'module name')
+            .option('-f --function <function>', 'function called in the module')
+            .option('-p --param <parameter_name_value>', 'name and value separated by = character')
+            .action(async (options: any) => {
+                console.log('options', options)
+            })
+    }
+}

package/src/QueryCommand.ts

@@ -5,6 +5,7 @@ import loglevel from 'loglevel'
 import { Cmd } from './Cmd'
 import { Command } from 'commander'
 import { DBClient } from "./DBClient"
+import inquirer from 'inquirer'
 const logger = loglevel.getLogger("QueryCommand.ts")
 logger.setLevel("debug")
 
@@ -14,6 +15,7 @@ export class QueryCommand extends Command {
         this.description('query management')
         this.addCommand(new QueryList('list', 'list queries'))
         this.addCommand(new QueryList('l', 'list queries'))
+        this.addCommand(new QueryDelete('delete'))
     }
 }
 
@@ -42,7 +44,47 @@ class QueryList extends Cmd {
     }
 }
 
+/**
+ * class QueryDelete
+ */
+class QueryDelete extends Cmd {
+    constructor(name: string) {
+        super(name)
+        this.description('delete query from cyk_query table')
+        .option('-y --yes', 'confirmation is not required')
+        .argument('<query>', 'query name')
+        .action(async (query, options) => {
+            await this.commandDelete(query, options)
+        })
+    }
 
+    async commandDelete(query: string, options: any) {
+        try {
+            await this.prologue(options)
+            if (! this.dbManager) throw 'dbManager undefined'
+
+            const dbQuery = await this.dbManager.dbQueryExist(query)
+            if (! dbQuery ) {
+                console.log('query ' + query + ' does not exist ')
+                return
+            }
+            let deleteConfirmed = (options.yes !== undefined)
+            if (deleteConfirmed === false) {
+                const reply = await inquirer.prompt({ type: 'confirm', name: 'confirm', message: 'Delete query ' + query + '?' })
+                if (reply.confirm) {
+                    deleteConfirmed = true
+                }
+            }
+            if (deleteConfirmed) {
+                await this.dbManager.dbQueryDelete(dbQuery)
+                console.log('Query ' + query + ' has been deleted')
+            }
+        }
+        catch (err) {
+            logger.error(err)
+        }
+    }
+}
 
 //--------------------------------------------------------------------------------------------------------------------
 // class queryData

package/src/TestCommand.ts

@@ -11,15 +11,15 @@ export class TestCommand extends Cmd {
     constructor() {
         super('test')
         this.description('test script').version('0.1')
-        .argument('<files...>', 'local module file(s) to test run')
-        .action(async(files: any, options: any) => {
-            await this.testRun(files, options)
-        })
+            .argument('<files...>', 'local module file(s) to test run')
+            .action(async (files: any, options: any) => {
+                await this.testRun(files, options)
+            })
     }
     async testRun(files: string[], options: any) {
         try {
             const signinResponse = await this.prologue(options)
-            for (let ind=0; ind < files.length; ind++) {
+            for (let ind = 0; ind < files.length; ind++) {
                 const result = await testfile(files[ind])
                 if (result === false) {
                     logger.debug('*********** FAILURE ' + files[ind] + ' ***************')
@@ -50,12 +50,12 @@ async function testfile(filename: string): Promise<boolean> {
 
     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)
+        logger.trace('DBREMOTE_URL ' + process.env.DBREMOTE_URL)
         const structure = new Structure()
         const nodeCrypto = new NodeCrypto()
         const dbRemote = new DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto)
@@ -67,7 +67,7 @@ async function testfile(filename: string): Promise<boolean> {
         let script = new Script(structure.scope, xmlfilename, xml.toString())
         const user_lang = login.content.user_lang
         if (user_lang && user_lang.trim() !== '') {
-            
+
             const langfilename = filename + "__" + user_lang + ".xml"
 
             if (fs.existsSync(langfilename)) {
@@ -97,11 +97,12 @@ async function testfile(filename: string): Promise<boolean> {
             let xmlError = <XmlError>err
             errorconsole(xmlError)
         }
-        console.log(err)
+        else
+            console.log(err)
     }
 
     let log = fs.readFileSync(logfilename)
-    if (fs.existsSync(outfilename) === true ) {
+    if (fs.existsSync(outfilename) === true) {
         let out = fs.readFileSync(outfilename)
 
         if (log.toString() === out.toString()) {

package/src/console.ts

@@ -17,6 +17,7 @@ export function errorconsole(xmlError: XmlError) {
             msg += ":" + (xmlError.tag.column + 1)
         }
         msg += ") ===============\n"
+        msg += xmlError.message
         console.log(msg)
     }
 }

package/src/index.ts

@@ -15,6 +15,7 @@ import { TableDataCommand } from './TableDataCommand'
 import { TestCommand } from './TestCommand'
 import { UninstallCommand } from './UninstallCommand'
 import { UserCommand } from './UserCommand'
+import { CronCommand } from './CronCommand'
 
 const logger = loglevel.getLogger("index.ts")
 logger.setLevel("debug")
@@ -175,7 +176,7 @@ class StopCommand extends Command {
  */
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.7.5')
+    .version('0.8.3')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))
@@ -198,5 +199,7 @@ program.addCommand(new RunCommand('run'))
 program.addCommand(new RunCommand('r'))
 program.addCommand(new OpenCommand('open'))
 program.addCommand(new OpenCommand('o'))
+program.addCommand(new CronCommand('cron'))
+program.addCommand(new CronCommand('c'))
 
 program.parse()

package/test/db/schema.xsd

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="query" type="queryType"/>
+    <xs:element name="object" type="declareObject"/>
+
+    <xs:complexType name="declareObject" mixed="true">
+        <xs:group ref="declareVariable" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:attribute name="name" type="xs:string"/>
+        <xs:attribute name="type" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:complexType name="queryType" mixed="true">
+        <xs:group ref="queryTypeChild" minOccurs="1" maxOccurs="unbounded"/>
+        <xs:attribute name="name" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:group name="queryTypeChild">
+        <xs:choice>
+            <xs:element name="string" type="queryStringChild"/>
+            <xs:element name="object" type="queryObjectChild"/>
+        </xs:choice>
+    </xs:group>
+
+    <xs:complexType name="queryStringChild">
+        <xs:simpleContent>
+            <xs:restriction base="stringType">
+                <xs:attribute name="name" use="required">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:enumeration value="sql"></xs:enumeration>
+                            <xs:enumeration value="fields"></xs:enumeration>
+                            <xs:enumeration value="entities"></xs:enumeration>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+            </xs:restriction>
+        </xs:simpleContent>
+    </xs:complexType>
+    
+    <xs:complexType name="queryObjectChild" mixed="true">
+        <xs:group ref="declareVariable" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:attribute name="name" type="xs:string" fixed="params"/>
+    </xs:complexType>
+
+    <xs:group name="declareVariable">
+        <xs:choice>
+            <xs:element name="number" type="numberType"/>
+            <xs:element name="string" type="stringType"/>
+            <xs:element name="query" type="queryType"/>
+            <xs:element name="object" type="declareObject"/>
+        </xs:choice>
+    </xs:group>
+
+    <xs:complexType name="numberType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string"/>
+            </xs:extension>
+        </xs:simpleContent>
+
+    </xs:complexType>
+
+    <xs:complexType name="stringType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string"/>
+                <xs:attribute name="literal" type="xs:string" fixed=""/>
+            </xs:extension>
+        </xs:simpleContent>
+
+    </xs:complexType>
+
+</xs:schema>

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>