@cyklang/cli 0.17.9 → 0.17.12

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.17.9');
+    .version('0.17.12');
 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.17.9",
+   "version": "0.17.12",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -19,7 +19,7 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.44.0",
+      "@cyklang/core": "^0.47.0",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/src/index.ts

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

package/test/db/t23.output

@@ -2,45 +2,10 @@ Third (1 sec)
 Second (2 sec)
 First (3 sec)
  AFTER parallel 
-<object name="meta">
-    <type name="resultset">
-        <object name="t_actor">
-        </object>
-        <object name="t_film">
-        </object>
-    </type>
-</object>
-<object name="resultset">
-    <object>
-        <object name="t_actor">
-            <object>
-                <number name="actor_id">1</number>
-                <string name="first_name" literal="">Maria</string>
-                <string name="last_name" literal="">DUPONT</string>
-                <string name="last_update">
-                </string>
-                <string name="cyk_remark" literal="">remarque</string>
-                <string name="cyk_disable">
-                </string>
-                <object name="t_actor__meta">
-                    <string name="user_name" literal="">cyk</string>
-                    <number name="last_update">1722224037733</number>
-                </object>
-            </object>
-        </object>
-        <object name="t_film">
-            <object>
-                <number name="film_id">1</number>
-                <string name="title" literal="">La mélodie du bonheur</string>
-                <string name="description" literal="">Le film préféré de Mao</string>
-                <number name="release_year">1965</number>
-                <number name="length">60</number>
-                <number name="language_id">1</number>
-                <object name="t_film__meta">
-                    <string name="user_name" literal="">cyk</string>
-                    <number name="last_update">1722224037859</number>
-                </object>
-            </object>
-        </object>
+<type name="resultset">
+    <object name="t_actor">
     </object>
-</object>
+    <object name="t_film">
+    </object>
+</type>
+t_actor.length = 3, t_film.length() =  1

package/test/db/t23.xml

@@ -44,6 +44,7 @@
     <object name="cache"/>
     <db.call module="t22" method="t_load_cache" returns="cache"/>
 
-    <print>cache</print>
+    <print>cache.meta</print>
+    <print>format("t_actor.length = {0}, t_film.length() =  {1}",cache.resultset.at(0).t_actor.length(),cache.resultset.at(0).t_film.length())</print>
 
 </module>

package/test/db/t33.output

@@ -1,98 +1,5 @@
 test dlookup: Maria
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    xmlns:java="http://xml.apache.org/xslt/java" exclude-result-prefixes="java">
-
-    <xsl:template match="object[@name='resultset']">
-
-        <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-            <fo:layout-master-set>
-                <!-- Définition du layout -->
-                <fo:simple-page-master master-name="page" page-height="29.7cm" page-width="21cm" margin="1.5cm">
-                    <fo:region-body margin-top="2cm"/>
-                    <fo:region-before extent="4cm"/>
-                </fo:simple-page-master>
-            </fo:layout-master-set>
-
-            <!-- Début du document -->
-            <fo:page-sequence master-reference="page">
-                <!-- En-tête de page -->
-                <fo:static-content flow-name="xsl-region-before">
-                    <fo:block>
-                        <fo:table width="100%" table-layout="fixed">
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <fo:table-body>
-                                <fo:table-row border-bottom="1pt solid black" border-top="1pt solid black" font="8pt Helvetica" font-weight="bold">
-                                    <fo:table-cell background-color="lightgray" padding="5pt" >
-                                        <fo:block>First Name</fo:block>
-                                    </fo:table-cell>
-                                    <fo:table-cell background-color="lightgray" padding="5pt" >
-                                        <fo:block>Last Name</fo:block>
-                                    </fo:table-cell>
-                                    <!-- Ajoutez autant de colonnes que nécessaire -->
-                                </fo:table-row>
-                            </fo:table-body>
-                        </fo:table>
-                    </fo:block>
-                    <!-- Entête avec des rectangles -->
-                    <fo:block>
-                        <fo:table width="100%" table-layout="fixed">
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <fo:table-body>
-                                <fo:table-row border-bottom="1pt solid black" border-top="1pt solid black" font="8pt Helvetica" font-weight="bold">
-                                    <fo:table-cell background-color="lightgray" padding="5pt" >
-                                        <fo:block>First Name</fo:block>
-                                    </fo:table-cell>
-                                    <fo:table-cell background-color="lightgray" padding="5pt" >
-                                        <fo:block>Last Name</fo:block>
-                                    </fo:table-cell>
-                                    <!-- Ajoutez autant de colonnes que nécessaire -->
-                                </fo:table-row>
-                            </fo:table-body>
-                        </fo:table>
-                    </fo:block>
-                </fo:static-content>
-
-                <!-- Corps de la page -->
-                <fo:flow flow-name="xsl-region-body">
-                    <!-- Tableau de données -->
-                    <fo:block >
-                        <fo:table width="100%" table-layout="fixed" font="8pt Helvetica">
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <fo:table-column column-width="proportional-column-width(1)"/>
-                            <!-- Ajoutez autant de colonnes que nécessaire-->
-                            <fo:table-body>
-                                <!-- Lignes de données -->
-                                <xsl:apply-templates select="object[@type='t__t_actor']"/>
-                            </fo:table-body>
-                        </fo:table>
-                    </fo:block>
-                </fo:flow>
-            </fo:page-sequence>
-        </fo:root>
-
-    </xsl:template>
-
-    <xsl:template match="/object/object[@name='resultset']/object[@type='t__t_actor']">
-        <fo:table-row border-bottom="1pt solid black" border-top="1pt solid black">
-            <fo:table-cell padding="5pt" >
-                <fo:block ><xsl:apply-templates select="string[@name='first_name']"/></fo:block>
-            </fo:table-cell>
-            <fo:table-cell padding="5pt"  >
-                <fo:block><xsl:apply-templates select="string[@name='last_name']"/></fo:block>
-            </fo:table-cell>
-            <!-- Ajoutez autant de cellules que nécessaire -->
-        </fo:table-row>
-        <xsl:apply-templates/>
-    </xsl:template>
-
-</xsl:stylesheet>
-
-dcount(actor_id, t_actor) = 2
+dcount(actor_id, t_actor) = 4
 dcount(actor_id, t_actor, actor_id < 2) = 1
-dsum(actor_id, t_actor) = 3
+dsum(actor_id, t_actor) = 10
 dsum(actor_id, t_actor, actor_id < 2) = 1

package/test/db/t33.xml

@@ -1,7 +1,7 @@
 <?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <print>"test dlookup: " + dlookup('first_name', 't_actor', 'actor_id=1')</print>
-    <print>hex2string(dlookup('asset_content','cyk_asset', "asset_route='/test/tableau.xml'"))</print>
+    <!-- <print>hex2string(dlookup('asset_content','cyk_asset', "asset_route='/test/tableau.xml'"))</print> -->
     <print>"dcount(actor_id, t_actor) = " + dcount("actor_id", "t_actor")</print>
     <print>"dcount(actor_id, t_actor, actor_id &lt; 2) = " + dcount("actor_id", "t_actor", "actor_id &lt; 2")</print>
 

package/test/t0.output

@@ -2,3 +2,5 @@ La date en français est 28/12/2021
 2812
 40
 dos1.id = 1 dos.libelle = DUPONT
+name = id, value = 1
+name = libelle, value = DUPONT

package/test/t0.xml

@@ -1,4 +1,5 @@
-<block>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<module>
     <type name="Dossier">
         <number name="id" />
         <string name="libelle" />
@@ -23,4 +24,13 @@
     <let name="dos1.libelle">"DUPONT"</let>
     <print>"dos1.id = "+ dos1.id + " dos.libelle = " + dos1.libelle</print>
 
-</block>
+    <call object="dos1" method="foreach">
+        <function>
+            <string name="value"/>
+            <string name="name"/>
+            <block>
+                <print>format("name = {0}, value = {1}",name,value)</print>
+            </block>
+        </function>
+    </call>
+</module>

package/test/t31.output

@@ -3,10 +3,10 @@ resume: John DOE : Le soldat inconnu
 name: John WAYNE
 resume: John WAYNE : Le cow-boy
 dtbirth: 04/11/1963 14:00
-dtbirth: novembre 1963
-numberformat(123456.789) : 123 456,789
-moneyformat(123456.789) : 123 456,79 €
-moneyformat(123456.789, 'USD') : 123 456,79 $US
+dtbirth: November 1963
+numberformat(123456.789) : 123,456.789
+moneyformat(123456.789) : €123,456.79
+moneyformat(123456.789, 'USD') : $123,456.79
 v._010_ = 1000
 v.AA = 2000
 v.AB = 500
@@ -21,3 +21,6 @@ v = <object>
 	<number name="AC">200</number>
 	<number name="AD">1300</number>
 </object>
+Compteur chiffres : 3
+Compteur 5 chiffres : 00003
+Nombre réél : 3.14

package/test/t31.xml

@@ -73,4 +73,8 @@
 
     <print>"v = " + xmlformat(v)</print>
 
+    <print>format("Compteur chiffres : {0:d}", 3)</print>
+    <print>format("Compteur 5 chiffres : {0:d5}", 3)</print>
+    <print>format("Nombre réél : {0:f}", 3.14159)</print>
+
 </module>

package/test/t32.output

@@ -0,0 +1 @@
+application/pdf

package/test/t32.xml

@@ -58,4 +58,5 @@
         <string name="data">data
         </string>
     </db.report>
+    <print>dbresult.mimetype</print>
 </module>

package/test/t34.output

@@ -24,3 +24,4 @@ split of text3 : <string literal="">&quot; 02/01/2023&quot;</string>
 <string literal="">-00000000016,99</string>
 <string literal="">&quot;EUR &quot;</string>
 date_1: " 02/01/2023", date_2: " 02/01/2023"
+result_sendmail.accepted : <string literal="">philippe.cyk@gmail.com</string>

package/test/t35.output

@@ -1,3 +1,10 @@
 function timeout done
 duration : 00:00:01
 15
+after timer
+count = 1
+count = 2
+count = 3
+count = 4
+count = 5
+end of timer

package/test/t35.xml

@@ -33,5 +33,7 @@
             </block>
         </function>
     </timer>
+    <print>format("after timer")</print>
+    <sleep>6000</sleep>
     <print>format("end of timer")</print>
 </module>

package/test/t36.output

@@ -149,3 +149,8 @@ AVANT add_language_map
 NIR
 APRES add_language_map
 CNAPS
+Feb-15-2024
+February 2024
+Feb-15-2024 14:00
+fixed(0, 2) = 0.00
+input = rue de la ferté, output = rue de la fert�

package/test/t37.output

@@ -14,20 +14,16 @@ result = <boolean name="ok">true</boolean>
         <number name="Id">2</number>
         <string name="Nom" literal="">LAU</string>
         <string name="Prénom" literal="">érika</string>
-        <number name="Salaire">
-        </number>
-        <string name="Commentaire">
-        </string>
+        <number name="Salaire"></number>
+        <string name="Commentaire"></string>
         <string name="Naissance" literal="">1934-03-17</string>
     </object>
     <object>
         <number name="Id">3</number>
         <string name="Nom" literal="">CYK</string>
         <string name="Prénom" literal="">Léon</string>
-        <number name="Salaire">
-        </number>
-        <string name="Commentaire">
-        </string>
+        <number name="Salaire"></number>
+        <string name="Commentaire"></string>
         <string name="Naissance">
         </string>
     </object>

package/test/t39.output

@@ -1 +1,11 @@
 SUCCES : item_codes has 120 with max = 120
+name = 1, variable = 1
+name = 2, variable = 1
+name = 3, variable = 1
+name = 4, variable = 1
+name = 5, variable = 1
+name = 6, variable = 1
+name = 7, variable = 1
+name = 8, variable = 1
+name = 9, variable = 1
+name = 10, variable = 1

package/test/t39.xml

@@ -34,4 +34,22 @@
 
     </if>
 
+    <call object="item_codes" method="foreach">
+        <function>
+            <number name="variable"/>
+            <string name="name"/>
+            <block>
+                <print>format("name = {0}, variable = {1}",name,variable)</print>
+                <if>
+                    <condition>name == "10"</condition>
+                    <then>
+                        <throw>format("Limte de 10 atteinte")</throw>
+                    </then>
+                </if>
+            </block>
+        </function>
+    </call>
+
+    <print>format("Ne doit pas s'afficher")</print>
+
 </module>

package/test/t40.output

@@ -0,0 +1,109 @@
+0 = zéro euro
+1 = un euro
+15.50 = quinze euros et cinquante centimes
+123.45 = cent vingt-trois euros et quarante-cinq centimes
+1001 = mille un euros
+1234567.89 = un million deux cent trente-quatre mille cinq cent soixante-sept euros et quatre-ving-neuf centimes
+71 = soixante et onze euros
+0.71 = zéro euro et soixante et onze centimes
+0 = zéro euro
+1 = un euro
+2 = deux euros
+3 = trois euros
+4 = quatre euros
+5 = cinq euros
+6 = six euros
+7 = sept euros
+8 = huit euros
+9 = neuf euros
+10 = dix euros
+11 = onze euros
+12 = douze euros
+13 = treize euros
+14 = quatorze euros
+15 = quinze euros
+16 = seize euros
+17 = dix-sept euros
+18 = dix-huit euros
+19 = dix-neuf euros
+20 = vingt euros
+21 = vingt et un euros
+22 = vingt-deux euros
+23 = vingt-trois euros
+24 = vingt-quatre euros
+25 = vingt-cinq euros
+26 = vingt-six euros
+27 = vingt-sept euros
+28 = vingt-huit euros
+29 = vingt-neuf euros
+30 = trente euros
+31 = trente et un euros
+32 = trente-deux euros
+33 = trente-trois euros
+34 = trente-quatre euros
+35 = trente-cinq euros
+36 = trente-six euros
+37 = trente-sept euros
+38 = trente-huit euros
+39 = trente-neuf euros
+40 = quarante euros
+41 = quarante et un euros
+42 = quarante-deux euros
+43 = quarante-trois euros
+44 = quarante-quatre euros
+45 = quarante-cinq euros
+46 = quarante-six euros
+47 = quarante-sept euros
+48 = quarante-huit euros
+49 = quarante-neuf euros
+50 = cinquante euros
+51 = cinquante et un euros
+52 = cinquante-deux euros
+53 = cinquante-trois euros
+54 = cinquante-quatre euros
+55 = cinquante-cinq euros
+56 = cinquante-six euros
+57 = cinquante-sept euros
+58 = cinquante-huit euros
+59 = cinquante-neuf euros
+60 = soixante euros
+61 = soixante et un euros
+62 = soixante-deux euros
+63 = soixante-trois euros
+64 = soixante-quatre euros
+65 = soixante-cinq euros
+66 = soixante-six euros
+67 = soixante-sept euros
+68 = soixante-huit euros
+69 = soixante-neuf euros
+70 = soixante-dix euros
+71 = soixante et onze euros
+72 = soixante-douze euros
+73 = soixante-treize euros
+74 = soixante-quatorze euros
+75 = soixante-quinze euros
+76 = soixante-seize euros
+77 = soixante-dix-sept euros
+78 = soixante-dix-huit euros
+79 = soixante-dix-neuf euros
+80 = quatre-vingts euros
+81 = quatre-ving-un euros
+82 = quatre-ving-deux euros
+83 = quatre-ving-trois euros
+84 = quatre-ving-quatre euros
+85 = quatre-ving-cinq euros
+86 = quatre-ving-six euros
+87 = quatre-ving-sept euros
+88 = quatre-ving-huit euros
+89 = quatre-ving-neuf euros
+90 = quatre-vingt-dix euros
+91 = quatre-vingt-onze euros
+92 = quatre-vingt-douze euros
+93 = quatre-vingt-treize euros
+94 = quatre-vingt-quatorze euros
+95 = quatre-vingt-quinze euros
+96 = quatre-vingt-seize euros
+97 = quatre-vingt-dix-sept euros
+98 = quatre-vingt-dix-huit euros
+99 = quatre-vingt-dix-neuf euros
+100 = cent euros

package/test/t40.xml

@@ -0,0 +1,23 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+
+<module>
+    <block>
+        <print>format("0 = {0}", montant_en_lettres(0))</print>
+        <print>format("1 = {0}", montant_en_lettres(1))</print>
+        <print>format("15.50 = {0}", montant_en_lettres(15.50))</print>
+        <print>format("123.45 = {0}", montant_en_lettres(123.45))</print>
+        <print>format("1001 = {0}", montant_en_lettres(1001))</print>
+        <print>format("1234567.89 = {0}", montant_en_lettres(1234567.89))</print>
+        <print>format("71 = {0}", montant_en_lettres(71))</print>
+        <print>format("0.71 = {0}", montant_en_lettres(0.71))</print>
+
+        <number name="indice">0</number>
+        <while>
+            <condition><![CDATA[ indice <= 100 ]]></condition>
+            <then>
+                <print>format("{0} = {1}",indice,montant_en_lettres(indice))</print>
+                <set name="indice">indice + 1</set>
+            </then>
+        </while>
+    </block>
+</module>