@cyklang/cli 0.3.1 → 0.5.0

package/src/DBClient.ts

@@ -1,5 +1,6 @@
-import { BasicType, DBColumn, DBExecuteRequest, DBManager, DBTable, ObjectData, parseXML, PrimitiveData } from "@cyklang/core";
+import { BasicType, DBColumn, DBExecuteRequest, DBManager, DBTable, ObjectData, parseXML, PrimitiveData, Script, variable2json, XmlError } from "@cyklang/core";
 import loglevel from "loglevel";
+import { errorconsole } from "./console";
 const logger = loglevel.getLogger('DBClient.ts')
 logger.setLevel('debug')
 // DBManager wrapper class
@@ -10,12 +11,47 @@ export class DBClient {
         this.dbManager = dbManager
     }
 
+    /**
+     * method execInstructions
+     * @param source 
+     */
+    async execInstructions(source: string) {
+        const script = `<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
+        <module>
+        ` + source + `
+        </module>`
+        await this.execScript(script)
+    }
+
+    /**
+     * method execScript
+     * @param source 
+     */
+    async execScript(source: string) {
+        try {
+            const script = new Script(this.dbManager.scope, '', source)
+            await script.parseInstructions()
+            await script.execute()
+        }
+        catch (err) {
+            console.log(source)
+            console.log()
+            if (err instanceof XmlError) {
+                let xmlError = <XmlError>err
+                errorconsole(xmlError)
+            }
+            console.log(err)
+        }
+    }
+
     async runQuery() {
 
     }
-    
+
     async selectFromTable(title: string, tableName: string, options:
-        { fields: string, sort?: string | undefined, where?: string | undefined, width?: string | undefined }) {
+        { fields: string, sort?: string | undefined, where?: string | undefined, width?: string | undefined }): Promise<any[]> {
+
+        let result: any[] = []
 
         try {
 
@@ -73,8 +109,13 @@ export class DBClient {
 
             const objDataset = objXmlResult.variables.getData(tableName) as ObjectData
             for (let ind = 0; ind < objDataset.variables.length(); ind++) {
-                const record = (objDataset.variables.at(ind)?.data as ObjectData)
-                list.addObjectData(record)
+                const variable = objDataset.variables.at(ind)
+                if (variable) {
+                    const record = (variable?.data as ObjectData)
+                    list.addObjectData(record)
+                    result.push(variable2json(variable))
+                }
+
             }
             logger.info(list.renderList(title))
 
@@ -82,6 +123,7 @@ export class DBClient {
         catch (err) {
             logger.error(err)
         }
+        return result
     }
 
     async deleteModule(dbname: string) {
@@ -90,7 +132,7 @@ export class DBClient {
             const dbModule = await this.dbManager.dbModuleExist(dbname)
 
             if (dbModule === undefined) {
-               throw ('Module ' + dbname + ' not found')
+                throw ('Module ' + dbname + ' not found')
             }
             await this.dbManager.dbModuleDelete(dbModule)
         }
@@ -183,7 +225,7 @@ class List {
         }
         this.lines.push(this.renderSeparator())
         this.lines.push('Number of lines : ' + this.rows.length)
-        
+
         return this.lines.join('\n')
     }
 
@@ -238,7 +280,7 @@ class List {
         }
 
         // replace \n with a space
-        result = result.replace(/\n/, ' ') 
+        result = result.replace(/\n/, ' ')
 
         if (width !== undefined && width !== 0) {
             if (result.length >= width) {

package/src/ModuleCommand.ts

@@ -14,11 +14,11 @@ export class ModuleCommand extends Command {
         super(name)
         this.description('manage modules')
         // upload
-        this.addCommand(new ModuleUpload('upload', `Upload local module file(s) to the database.
+        this.addCommand(new ModuleU('upload', `Upload local module file(s) to the database.
 Module name is the base name of the file. If a module with the same name already exists, it will be updated.
 Otherwise, a new module is inserted in the database. To rename a module, use option --id to indicate the module you want to rename`)
         )
-        this.addCommand(new ModuleUpload('u', 'shortcut for (u)pload'))
+        this.addCommand(new ModuleU('u', 'shortcut for (u)pload'))
         // download
         this.addCommand(new ModuleDownload('download', 'download module files to the current directory'))
         this.addCommand(new ModuleDownload('d', 'shortcut for (d)ownload'))
@@ -45,16 +45,57 @@ interface UploadOptions {
     id: string | undefined
     env: string | undefined
 }
-class ModuleUpload extends Cmd {
+
+/**
+ * class ModuleU
+ */
+class ModuleU extends Cmd {
     constructor(name: string, description: string) {
         super(name)
         this.description(description)
-            .option('-i --id <id>', 'module ID to upload')
+            .option('--auth <auth_schema>', 'authentication schema : basic | token | cookie | any | none, default is none')
+            .option('--access <access_right>', 'access rights required')
+            .option('-i --id <id>', 'module ID to upload or update')
             .argument('[files...]', 'local module file(s) to upload to the server')
             .action(async (files: any, options: any) => {
-                await this.commandUpload(files, options)
+                await this.commandU(files, options)
             })
     }
+
+    async commandU(files: string[], options: any) {
+        if (files.length > 0) {
+            await this.commandUpload(files, options)
+        }
+        else {
+            await this.commandUpdate(options)
+        }
+    }
+
+    /**
+     * method commandUpdate
+     * @param options 
+     */
+    async commandUpdate(options: any) {
+        try {
+            await this.prologue(options)
+            if (this.dbManager === undefined) throw 'dbManager undefined'
+
+            if (options.id === undefined) throw '<id_or_route> of module to update is missing'
+
+            const dbModule = await this.dbManager.getModule(options.id)
+
+            await this.updateAuthAccess('cyk_module', 'module', dbModule.id || '', options)
+        }
+        catch (err) {
+            logger.error(err)
+        }
+    }
+
+    /**
+     * method commandUpload
+     * @param files 
+     * @param options 
+     */
     async commandUpload(files: string[], options: UploadOptions) {
         try {
             await this.prologue(options)

package/src/OpenCommand.ts

@@ -0,0 +1,31 @@
+import { Cmd } from "./Cmd";
+
+import loglevel from 'loglevel'
+const logger = loglevel.getLogger('OpenCommand.ts')
+logger.setLevel('debug')
+
+export class OpenCommand extends Cmd {
+    constructor() {
+        super('open')
+        this.description('open browser').version('0.1')
+            .argument('<module>', 'module to execute')
+            .action(async (module: any, options: any) => {
+                await this.openBrowser(module, options)
+            })
+    }
+
+    async openBrowser(module: string, options: any) {
+        try {
+            await this.prologue(options)
+
+            if (process.env.DBREMOTE_URL === undefined) throw 'DBREMOTE_URL undefined'
+            const url = process.env.DBREMOTE_URL + '/cyk/#/run/' + module;
+            const open = await import('open');
+            open.default(url)
+        }
+        catch (err) {
+            logger.error(err)
+        }
+    }
+
+}

package/src/TableCommand.ts

@@ -22,6 +22,47 @@ export class TableCommand extends Command {
         this.addCommand(new TableList('l', '(l)ist database tables'))
         this.addCommand(new TableData('data', 'table (d)ata'))
         this.addCommand(new TableData('d', 'table (d)ata'))
+        this.addCommand(new TableUpdate('update', 'update table properties'))
+        this.addCommand(new TableUpdate('u', 'shortcut for (u)pdate table properties'))
+    }
+}
+
+/**
+ * class TableUpdate
+ */
+class TableUpdate extends Cmd {
+
+    /**
+     * 
+     * @param name 
+     * @param description 
+     */
+    constructor(name: string, description: string) {
+        super(name)
+        this.description(description)
+        .option('-n --name <table_name>', 'name of the table whose properties are to be changed')
+        .option('--auth <auth_schema>', 'authentication schema : basic | token | cookie | any | none, default is none')
+        .option('--access <access>', 'access rights required')
+        .action(async (options: any) => {
+            await this.commandUpdate(options)
+        })
+    }
+
+    async commandUpdate(options: any) {
+        try {
+            await this.prologue(options)
+            if (this.dbManager === undefined) throw 'dbManager undefined'
+
+            if ( ! options.name ) throw '<table_name> is missing'
+
+            const dbTable = await this.dbManager.dbTableExist(options.name)
+            if ( ! dbTable ) throw 'Table ' + options.name + ' not found'
+
+            await this.updateAuthAccess('cyk_table', 'table', dbTable.id || '', options)
+        }
+        catch (err) {
+            logger.error(err)
+        }
     }
 }
 

package/src/UserCommand.ts

@@ -17,6 +17,7 @@ export class UserCommand extends Command {
         this.addCommand(new UserUpdateCmd('u', 'shortcut for (u)pdate'))
         this.addCommand(new UserDeleteCmd('delete', 'delete user by id and name. Both options are mandatory to avoid typing error'))
         this.addCommand(new UserPasswdCmd('passwd', 'change user password'))
+        this.addCommand(new UserPasswdCmd('p', 'shortcut for (p)asswd'))
         this.addCommand(new UserListCmd('list', 'list users'))
         this.addCommand(new UserListCmd('l', 'shortcut for (l)ist'))
     }
@@ -41,7 +42,7 @@ class UserAddCmd extends Cmd {
         this.description(description)
             .requiredOption('-n --name <name>', 'user name')
             .option('-e --email <email>', 'user email address')
-            .option('-p --passwd <password>', 'initial password')
+            .option('-p --password <password>', 'initial password')
             .option('-a --access <acl>', 'access control list')
             .option('-m --module <module_name>', 'module to launch by default')
             .option('-d --disable', 'user not abled to connect')
@@ -63,7 +64,11 @@ class UserAddCmd extends Cmd {
             await this.prologue(options)
             if (this.dbManager === undefined) throw 'dbManager undefined'
             const result = await this.dbManager.dbUserInsert(dbUser)
-            logger.debug(result)
+            logger.debug('ID', result)
+            if (dbUser.password) {
+                await this.dbManager.dbUserPasswd(result, dbUser.password)
+                logger.info('password changed for user ' + dbUser.name)
+            }
         }
         catch (err) {
             logger.error(err)
@@ -174,7 +179,7 @@ class UserDeleteCmd extends Cmd {
 
 class UserPasswdCmd extends Cmd {
     constructor(name: string, description: string) {
-        super('passwd')
+        super(name)
 
         this.description(description)
             .requiredOption('-i --id <id>', 'user ID')

package/src/index.ts

@@ -9,6 +9,7 @@ import { TestCommand } from './TestCommand'
 import { RunCommand } from './RunCommand'
 import { InitCommand } from './InitCommand'
 import { AssetCommand } from './AssetCommand'
+import { OpenCommand } from './OpenCommand'
 const logger = loglevel.getLogger("index.ts")
 logger.setLevel("debug")
 
@@ -29,5 +30,6 @@ program.addCommand(new TableCommand('table'))
 program.addCommand(new TableCommand('t'))
 program.addCommand(new TestCommand())
 program.addCommand(new RunCommand())
+program.addCommand(new OpenCommand())
 
 program.parse()

package/test/t26.output

@@ -3,3 +3,10 @@ date :  <b>Gras</b> <i>Italic </i>
 format 1 : Format sans paramètre
 format 2 : Nom : CYK Final
 format 3 : Nom : { CYK Prénom Philippe }
+{"name":"CYK","surname":"Philippe","adresses":[{"town":"Saint-Denis","department":"Reunion"},{"town":"Paris","department":"Paris"}]}
+var1 = undefined
+var2 = undefined
+var1 == var2
+after set var2 from var1
+var1 == var2
+var1 == var3

package/test/t26.xml

@@ -31,5 +31,42 @@
     </object>
 
     <print>json(person)</print>
+
+    <string name="var1"/>
+    <string name="var2"/>
+    <print>"var1 = " + var1</print>
+    <print>"var2 = " + var2</print>
+
+
+    <if>
+        <condition>var1 == var2</condition>
+        <then>
+            <print>"var1 == var2"</print>
+        </then>
+    </if>
+
+    <set name="var2">var1</set>
+    <print>"after set var2 from var1"</print>
+
+    <if>
+        <condition>var1 == var2</condition>
+        <then>
+            <print>"var1 == var2"</print>
+        </then>
+    </if>
+
+    <string name="var3">var1</string>
+
+    <if>
+        <condition>var1 == var3</condition>
+        <then>
+            <print>"var1 == var3"</print>
+        </then>
+        <else>
+            <print>"var1 !== var3"</print>
+        </else>
+    </if>
+    
+
     
 </module>

package/test/t27.output

@@ -0,0 +1,2 @@
+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}

package/test/t27.xml

@@ -0,0 +1,18 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<module>
+    <print>objson('150')</print>
+    <string name="chaine" literal=""><![CDATA[ 
+        {
+            "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
+          }
+        ]]>
+    </string>
+    <print>json(objson(chaine))</print>
+</module>

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es2020",
-    "module": "commonjs",
+    "module": "Node16",
     "declaration": true,
     "outDir": "./build",
     "strict": true,