@cyklang/cli 0.2.3 → 0.3.1

package/test/t0.output

@@ -1,4 +1,4 @@
-Aujourd'hui c'est 28/12/2021
+La date en français est 28/12/2021
 2812
 40
 dos1.id = 1 dos.libelle = DUPONT

package/test/t0.xml

@@ -11,7 +11,7 @@
     <let name="jour">28</let>
     <let name="mois">12</let>
     <let name="annee">2021</let>
-    <let name="message">"Aujourd'hui c'est " + jour + "/" + mois + "/" + annee</let>
+    <let name="message">format("La date en français est {0}/{1}/{2}", jour, mois, annee)</let>
     <print>message</print>
     <print>"28" + "12"</print>
     <print>28 + 12</print>

package/test/t01.output

@@ -2,14 +2,27 @@
 Dossier remorquage : DURAND lieu Saint-Denis
 then dos2.libelle == DURAND
 Nested block dos1.id 1
-*** Function add BEGIN150
+*** Function add BEGIN a 150 b 300
+else a gt b
 **** Function add output c =450
 Result 150 + 300 : 450
-*** Function add BEGIN1000
+*** Function add BEGIN a 1000 b 2000
+else a gt b
 **** Function add output c =3000
 Result 1000 + 2000 : 3000
 Before fact of 4
+fact begin N = 4
+fact begin N = 3
+fact begin N = 2
+fact begin N = 1
+fact begin N = 0
 factorielle de 4 = 24
+fact begin N = 5
+fact begin N = 4
+fact begin N = 3
+fact begin N = 2
+fact begin N = 1
+fact begin N = 0
 factorielle de 5 : 120
 PST1 id=100 libelle=Prestation 1
 PST2 id=100 libelle=Prestation 2
@@ -30,3 +43,4 @@ dos3 300 dossier 300
 Vidage de l'object pst1 :
 name id, value 100
 name libelle, value Prestation 2
+v_obj.nested.member = 888

package/test/t01.xml

@@ -13,12 +13,21 @@
     <type name="dossier_remorquage" base="dossier">
         <string name="lieu" />
     </type>
-    
+
     <function name="add" returns="c: number">
         <number name="a" />
         <number name="b"/>
         <block>
-            <print>"*** Function add BEGIN" + a</print>
+            <print>"*** Function add BEGIN a " + a + " b " + b</print>
+            <if>
+                <condition><![CDATA[ a > b]]></condition>
+                <then>
+                    <print>"then a gt b"</print>
+                </then>
+                <else>
+                    <print>"else a gt b"</print>
+                </else>
+            </if>
             <let name="c">a + b</let>
             <print>"**** Function add output c =" + c</print>
         </block>
@@ -26,15 +35,18 @@
     <function name="fact" returns="result: number">
         <number name="N"/>
         <block>
+            <print>"fact begin N = " + N</print>
+            <number name="fact1">1</number>
+            <number name="N_1">N   -   1</number>
             <if>
                 <condition><![CDATA[ N <= 0]]></condition>
                 <then>
                     <let name="result">1</let>
                 </then>
                 <else>
-                    <number name="fact1">1</number>
+
                     <call function="fact" returns="fact1">
-                        <number name="N">N - 1</number>
+                        <number name="N">N_1</number>
                     </call>
                     <let name="result">N * fact1</let>
                 </else>
@@ -79,13 +91,13 @@
     <print>"Result 150 + 300 : " + result</print>
     <let name="result">add(1000,2000)</let>
     <print>"Result 1000 + 2000 : " + result</print>
-    <number name="N"> 4 </number>
+    <number name="Nombre"> 4 </number>
 
-    <print>"Before fact of " + N</print>
+    <print>"Before fact of " + Nombre</print>
     <call function="fact" returns="result">
-        <number name="N">N</number>
+        <number name="N">Nombre</number>
     </call>
-    <print>"factorielle de " + N + " = " + result</print>
+    <print>"factorielle de " + Nombre + " = " + result</print>
     <print>"factorielle de 5 : " + fact(5)</print>
     <object type="prestation" name="pst1">
         <number name="id">100</number>
@@ -182,4 +194,30 @@
             </block>
         </function>
     </call>
+
+    <!-- context of callee if FunctionData.funct -->
+
+    <object name="v_obj"/>
+    <number name="caller_nb">888</number>
+
+    <function name="callee">
+        <block>
+            <call object="v_obj" method="push">
+                <object name="nested">
+                    <number name="member">caller_nb</number>
+                </object>
+            </call>
+        </block>
+    </function>
+
+    <function name="caller">
+        <block>
+            <number name="caller_nb">999</number>
+            <call function="callee"/>
+            <print>"v_obj.nested.member = "  + v_obj.nested.member</print>
+        </block>
+    </function>
+
+    <call function="caller"/>
+
 </module>

package/test/t0__us.output

@@ -0,0 +1,4 @@
+The date in US english is 12/28/2021
+2812
+40
+dos1.id = 1 dos.libelle = DUPONT

package/test/t0__us.xml

@@ -0,0 +1,7 @@
+<?xml-model href="cyklang.xsd" ?>
+<module>
+    <map name="us">
+        <key>La date en français est {0}/{1}/{2}</key>
+        <value>The date in US english is {1}/{0}/{2}</value>
+    </map>
+</module>

package/test/t1.ts

@@ -0,0 +1,8 @@
+const obj: any = {}
+if (obj) {
+    console.log('{} is true')
+}
+else {
+    console.log('{} is false')
+}
+obj.toto = 'toto'

package/test/t20.xml

@@ -12,4 +12,20 @@
             <print>"print_settings : " + string(settings)</print>
         </block>
     </function>
+
+    <!-- context of callee if FunctionData.funct -->
+
+    <number name="caller_nb">888</number>
+
+    <function name="callee">
+        <object name="v_obj"/>
+        <block>
+            <call object="v_obj" method="push">
+                <object name="nested">
+                    <number name="member">caller_nb</number>
+                </object>
+            </call>
+        </block>
+    </function>
+
 </module>

package/test/t21.output

@@ -1,3 +1,5 @@
+chaine = A + B
+f_module_arg : v_obj.nested.member = 888
 print_settings : <string name="name" literal="">Dupont</string>
 <string name="surname" literal="">Jean</string>
 owner not set

package/test/t21.xml

@@ -9,13 +9,37 @@
         <string name="surname">"Jean"</string>
     </object>
     <module_object name="m_t20"/>
+
     <set name="m_t20" module="t20">
-        <object name="settings">params</object> 
-    </set> 
- 
+         <object name="settings">params</object>
+    </set>
+
     <!-- <call object="m_t20" method="__init__">
         <object name="settings">params</object>
     </call> -->
+
+    <object name="v_obj"/>
+    <number name="caller_nb">999</number>
+
+    <!-- <call function="m_t20.callee">
+        <object name="v_obj">v_obj</object>
+    </call>
+
+    <print>"v_obj.nested.member = "  + v_obj.nested.member</print> -->
+
+    <function name="f_module_arg">
+        <module_object name="module"/>
+        <block>
+            <call function="module.callee">
+                <object name="v_obj">v_obj</object>
+            </call>
+            <print>"f_module_arg : v_obj.nested.member = "  + v_obj.nested.member</print>
+        </block>
+    </function>
+    <call function="f_module_arg">
+        <module_object name="module">m_t20</module_object>
+    </call>
+
     <call object="m_t20" method="print_settings"/>
 
     <object name="obj">m_t20</object>
@@ -29,7 +53,7 @@
         </object>
     </object>
     <if>
-        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]>  </condition>
+        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]></condition>
         <then>
             <print>owner + "'s car's brand is " + cars.get(owner).brand</print>
         </then>
@@ -39,7 +63,7 @@
     </if>
     <set name="owner">"yves"</set>
     <if>
-        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]>  </condition>
+        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]></condition>
         <then>
             <print>owner + "'s car's brand is " + cars.get(owner).brand</print>
         </then>
@@ -49,7 +73,7 @@
     </if>
     <set name="owner">"john"</set>
     <if>
-        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]>  </condition>
+        <condition><![CDATA[ owner !== undefined && cars.get(owner) !== undefined && cars.get(owner).has('brand') == true  ]]></condition>
         <then>
             <print>owner + "'s car's brand is " + cars.get(owner).brand</print>
         </then>
@@ -61,7 +85,7 @@
     <boolean name="bool">true</boolean>
     <set name="bool">boolean("")</set>
     <print>"bool : " + bool</print>
-    
+
     <set name="chaine">150</set>
     <print>"chaine : " + chaine</print>
 

package/test/t23.output

@@ -1,47 +1,3 @@
-Client side : <string name="name" literal="">CYK</string>
-<string name="surname" literal="">Philippe</string>
-<object name="setting">
-    <object name="jnl_id">
-        <string name="stg_code" literal="">jnl_id</string>
-        <number name="stg_num">2</number>
-        <string name="stg_text">
-        </string>
-        <string name="stg_label" literal="">ID journal de Saisie</string>
-    </object>
-    <object name="month_begin">
-        <string name="stg_code" literal="">month_begin</string>
-        <number name="stg_num">
-        </number>
-        <string name="stg_text" literal="">2021-01-01</string>
-        <string name="stg_label" literal="">1er Jour du Mois de Saisie</string>
-    </object>
-    <object name="year">
-        <string name="stg_code" literal="">year</string>
-        <number name="stg_num">2021</number>
-        <string name="stg_text">
-        </string>
-        <string name="stg_label" literal="">Year</string>
-    </object>
-    <object name="acct_num">
-        <string name="stg_code" literal="">acct_num</string>
-        <number name="stg_num">
-        </number>
-        <string name="stg_text" literal="">10131</string>
-        <string name="stg_label" literal="">Numéro de Compte</string>
-    </object>
-</object>
-<object name="meta">
-    <string name="setting" literal="">&lt;db.table name=&quot;setting&quot; id=&quot;19&quot;&gt;
-    &lt;string name=&quot;stg_code&quot; type=&quot;varchar(30)&quot; primary=&quot;&quot;&gt;
-    &lt;/string&gt;
-    &lt;number name=&quot;stg_num&quot; type=&quot;int&quot;&gt;
-    &lt;/number&gt;
-    &lt;string name=&quot;stg_text&quot; type=&quot;varchar(255)&quot;&gt;
-    &lt;/string&gt;
-    &lt;string name=&quot;stg_label&quot; type=&quot;varchar(255)&quot;&gt;
-    &lt;/string&gt;
-&lt;/db.table&gt;</string>
-</object>
 Third (1 sec)
 Second (2 sec)
 First (3 sec)

package/test/t23.xml

@@ -7,7 +7,7 @@
 
             <!-- <db.execute module="t22" method="get_tables" returns="settings">
             </db.execute> -->
-            <print>"Client side : " + string(settings)</print>
+            <!-- <print>"Client side : " + string(settings)</print> -->
         </block>
     </function>
 

package/test/t26.output

@@ -0,0 +1,5 @@
+nom : CHANE
+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 }

package/test/t26.xml

@@ -0,0 +1,35 @@
+<?xml-model href="cyklang.xsd" ?>
+<module>
+    <map name="hash">
+        <key>nom</key><value>CHANE</value>
+        <key>prénom</key><value>Philippe</value>
+        <key>Nom : {{ {0} Prénom {1} }}</key><value>Firstname : {{ {1} Name {0} }}</value>
+    </map>
+    <print>"nom : " + hash.get("nom")</print>
+    <call object="hash" method="set">
+        <string name="key">"date"</string>
+        <string name="value" literal=""><![CDATA[ <b>Gras</b> <i>Italic </i>]]></string>
+    </call>
+    <print>"date : " + hash.get("date")</print>
+    <print>"format 1 : " + format("Format sans paramètre")</print>
+    <print>"format 2 : " + format("Nom : {0} Final", "CYK")</print>
+    <print>"format 3 : " + format("Nom : {{ {0} Prénom {1} }}", "CYK", "Philippe")</print>
+
+    <object name="person">
+        <string name="name">"CYK"</string>
+        <string name="surname">"Philippe"</string>
+        <object name="adresses">
+            <object>
+                <string name="town">"Saint-Denis"</string>
+                <string name="department">"Reunion"</string>
+            </object>
+            <object>
+                <string name="town">"Paris"</string>
+                <string name="department">"Paris"</string>
+            </object>
+        </object>
+    </object>
+
+    <print>json(person)</print>
+    
+</module>