@cyklang/cli 0.14.18 → 0.15.0

package/build/UserCommand.js

@@ -33,6 +33,7 @@ class UserAddCmd extends Cmd_1.Cmd {
         super(name);
         this.description(description)
             .requiredOption('-n --name <name>', 'user name')
+            .option('-c --company <company_id>', 'user company ID')
             .option('-e --email <email>', 'user email address')
             .option('-p --password <password>', 'initial password')
             .option('-a --access <acl>', 'access control list')
@@ -43,6 +44,7 @@ class UserAddCmd extends Cmd_1.Cmd {
             const dbUser = new core_1.DBUser();
             dbUser.name = options.name;
             dbUser.email = options.email;
+            dbUser.company = options.company;
             dbUser.password = options.password;
             dbUser.access = options.access;
             dbUser.appli = options.module;
@@ -83,7 +85,7 @@ class UserListCmd extends Cmd_1.Cmd {
             if (this.dbManager === undefined)
                 throw 'dbManager undefined';
             const dbClient = new DBClient_1.DBClient(this.dbManager);
-            dbClient.selectFromTable('List of users', 'cyk_user', { fields: 'user_id,user_name,user_email,user_access,user_appli,user_lang,user_disable', sort: options.sort || '1' });
+            dbClient.selectFromTable('List of users', 'cyk_user', { fields: 'user_id,user_name,user_email,user_company,user_access,user_appli,user_lang,user_disable', sort: options.sort || '1' });
         }
         catch (err) {
             logger.error(err);
@@ -96,6 +98,7 @@ class UserUpdateCmd extends Cmd_1.Cmd {
         this.description(description)
             .requiredOption('-i --id <id>', 'user ID')
             .option('-n --name <name>', 'user name')
+            .option('-c --company <company_id>', 'user company ID')
             .option('-e --email <email>', 'user email address')
             .option('-a --access <acl>', 'access control list')
             .option('-m --module <module_name>', 'module to launch by default')
@@ -106,6 +109,7 @@ class UserUpdateCmd extends Cmd_1.Cmd {
             dbUser.id = options.id;
             dbUser.name = options.name;
             dbUser.email = options.email;
+            dbUser.company = Number(options.company);
             dbUser.access = options.access;
             dbUser.appli = options.module;
             dbUser.lang = options.lang;
@@ -128,6 +132,8 @@ class UserUpdateCmd extends Cmd_1.Cmd {
                 dbUser1.name = dbUser2.name;
             if (dbUser2.email !== undefined)
                 dbUser1.email = dbUser2.email;
+            if (dbUser2.company !== undefined)
+                dbUser1.company = dbUser2.company;
             if (dbUser2.access !== undefined)
                 dbUser1.access = dbUser2.access;
             if (dbUser2.appli !== undefined)

package/build/index.js

@@ -182,7 +182,7 @@ class StopCommand extends commander_1.Command {
  */
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
-    .version('0.14.18');
+    .version('0.15.0');
 program.addCommand(new StartCommand('start'));
 program.addCommand(new StopCommand('stop'));
 program.addCommand(new InstallCommand_1.InstallCommand('install'));

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.14.18",
+   "version": "0.15.0",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -19,7 +19,7 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.18.0",
+      "@cyklang/core": "^0.20.0",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/src/UserCommand.ts

@@ -26,6 +26,7 @@ export class UserCommand extends Command {
 interface Options {
     id: string | undefined
     name: string | undefined
+    company: number | undefined
     email: string | undefined
     access: string | undefined
     module: string | undefined
@@ -41,6 +42,7 @@ class UserAddCmd extends Cmd {
         super(name)
         this.description(description)
             .requiredOption('-n --name <name>', 'user name')
+            .option('-c --company <company_id>', 'user company ID')
             .option('-e --email <email>', 'user email address')
             .option('-p --password <password>', 'initial password')
             .option('-a --access <acl>', 'access control list')
@@ -51,6 +53,7 @@ class UserAddCmd extends Cmd {
                 const dbUser = new DBUser()
                 dbUser.name = options.name
                 dbUser.email = options.email
+                dbUser.company = options.company
                 dbUser.password = options.password
                 dbUser.access = options.access
                 dbUser.appli = options.module
@@ -92,7 +95,7 @@ class UserListCmd extends Cmd {
 
             const dbClient = new DBClient(this.dbManager)
             dbClient.selectFromTable('List of users', 'cyk_user',
-                { fields: 'user_id,user_name,user_email,user_access,user_appli,user_lang,user_disable', sort: options.sort || '1' })
+                { fields: 'user_id,user_name,user_email,user_company,user_access,user_appli,user_lang,user_disable', sort: options.sort || '1' })
 
         }
         catch (err) {
@@ -108,6 +111,7 @@ class UserUpdateCmd extends Cmd {
         this.description(description)
             .requiredOption('-i --id <id>', 'user ID')
             .option('-n --name <name>', 'user name')
+            .option('-c --company <company_id>', 'user company ID')
             .option('-e --email <email>', 'user email address')
             .option('-a --access <acl>', 'access control list')
             .option('-m --module <module_name>', 'module to launch by default')
@@ -118,6 +122,7 @@ class UserUpdateCmd extends Cmd {
                 dbUser.id = options.id
                 dbUser.name = options.name
                 dbUser.email = options.email
+                dbUser.company = Number(options.company)
                 dbUser.access = options.access
                 dbUser.appli = options.module
                 dbUser.lang = options.lang
@@ -135,6 +140,7 @@ class UserUpdateCmd extends Cmd {
             // const dbUser1: DBUser = { id: user.user_id, name: user.user_name, email: user.user_email, password: user.user_password, access: user.user_access, appli: user.user_appli, disable: user.user_disable }
             if (dbUser2.name !== undefined) dbUser1.name = dbUser2.name
             if (dbUser2.email !== undefined) dbUser1.email = dbUser2.email
+            if (dbUser2.company !== undefined) dbUser1.company = dbUser2.company
             if (dbUser2.access !== undefined) dbUser1.access = dbUser2.access
             if (dbUser2.appli !== undefined) dbUser1.appli = dbUser2.appli
             if (dbUser2.lang !== undefined) dbUser1.lang = dbUser2.lang

package/src/index.ts

@@ -176,7 +176,7 @@ class StopCommand extends Command {
  */
 const program = new Command()
 program.name('cyk').description('cyklang CLI')
-    .version('0.14.18')
+    .version('0.15.0')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))

package/test/t34.output

@@ -14,3 +14,13 @@ dialog=<boolean name="__dirty__">false</boolean>
 dialog.grid.f1() = 50
 dialog.grid.boole = false
 dialog2.__dirty__ = false
+result_matchre_1 = <string literal="">riode : 01/01/2023 - 31/12/2023&quot;</string>
+<string literal="">01/01/2023</string>
+<string literal="">31/12/2023</string>
+text2 [ toto ] does not match /riode : (.*) - (.*)"/
+split of text3 : <string literal="">&quot; 02/01/2023&quot;</string>
+<string literal="">&quot; 02/01/2023&quot;</string>
+<string literal="">&quot;CARTE 30/12/22 APPLE.COM/BILL    CB*1998&quot;</string>
+<string literal="">-00000000016,99</string>
+<string literal="">&quot;EUR &quot;</string>
+date_1: " 02/01/2023", date_2: " 02/01/2023"

package/test/t34.xml

@@ -37,7 +37,7 @@
                 <call object="buffer" method="push">
                     <string><![CDATA[ "Contenu du Journal" ]]></string>
                 </call>
-                
+
                 <!-- <call object="this" method="foreach">
                     <function>
                         <object name="journal"/>
@@ -106,5 +106,25 @@
     <object name="dialog2" type="TDialog"></object>
     <print>"dialog2.__dirty__ = " + dialog2.__dirty__</print>
 
+    <string name="text1" literal="">"*** PÈriode : 01/01/2023 - 31/12/2023"</string>
+    <string name="text2" literal="">toto</string>
+    <string name="regexp_1" literal="">riode : (.*) - (.*)"</string>
+    <object name="result_matchre_1">matchre(text1, regexp_1)</object>
+    <print>"result_matchre_1 = " + string(result_matchre_1)</print>
+
+    <object name="result_matchre_2">matchre(text2, regexp_1)</object>
+    <if>
+        <condition>result_matchre_2</condition>
+        <then>
+            <print>"result_matchre_2 = " + string(result_matchre_2)</print>
+        </then>
+        <else>
+            <print>format("text2 [ {0} ] does not match /{1}/", text2, regexp_1)</print>
+        </else>
+    </if>
    
+    <string name="text3" literal="">" 02/01/2023"	" 02/01/2023"	"CARTE 30/12/22 APPLE.COM/BILL    CB*1998"	-00000000016,99	"EUR "</string>
+    <object name="result_split">split(text3, "\t")</object>
+    <print>"split of text3 : " + string(result_split)</print>
+    <print>format("date_1: {0}, date_2: {1}", result_split.at(0), result_split.at(1))</print>
 </module>