@cyklang/cli 0.9.3 → 0.11.1

package/build/AssetCommand.js

@@ -56,7 +56,7 @@ const scanAssets = async (dbManager, dest) => {
         throw 'xmlResult null or undefined';
     const tag = (0, core_1.parseXML)('scanAssets', xmlResult);
     const objResult = await dbManager.scope.structure.objectDataType.parseData(tag, dbManager.scope);
-    const rows = objResult.variables.getData('cyk_asset').variables;
+    const rows = objResult.variables.getData('resultset').variables;
     for (let ind = 0; ind < rows.list.length; ind++) {
         const { variable: row } = rows.list[ind];
         const record = row.data;
@@ -489,11 +489,9 @@ async function uploadAssetContent(dbAsset, fileName, dbRemote) {
         const file = fs.createReadStream(fileName);
         const form = new form_data_1.default();
         form.append('uploadFile', file);
-        const route = '/api/upload/cyk_asset/asset_content?asset_id=' + dbAsset.id;
+        const route = `/api/admin/assets/${dbAsset.id}/content`;
         const resp = await dbRemote?.apiServer.post(route, form);
-        if (resp.status === 200) {
-            logger.info(fileName + ' uploaded');
-        }
+        logger.debug("metadata", resp);
     }
     catch (err) {
         logger.error(err);

package/build/DBClient.d.ts

@@ -12,7 +12,6 @@ export declare class DBClient {
      * @param source
      */
     execScript(source: string): Promise<void>;
-    runQuery(): Promise<void>;
     selectFromTable(title: string, tableName: string, options: {
         fields: string;
         sort?: string | undefined;
@@ -20,4 +19,9 @@ export declare class DBClient {
         width?: string | undefined;
     }): Promise<any[]>;
     deleteModule(dbname: string): Promise<void>;
+    /**
+     *
+     * @param sql
+     */
+    runQuery(sql: string): Promise<void>;
 }

package/build/DBClient.js

@@ -45,8 +45,6 @@ class DBClient {
             console.log(err);
         }
     }
-    async runQuery() {
-    }
     async selectFromTable(title, tableName, options) {
         let result = [];
         try {
@@ -67,7 +65,7 @@ class DBClient {
                         order_by += ',';
                     order_by += colname;
                 }
-                logger.debug('order_by ' + order_by);
+                // logger.debug('order_by ' + order_by)
                 request.parameters.addVariable('order_by', stringDataType).data = new core_1.PrimitiveData(stringDataType, order_by);
             }
             // if (options !== undefined) {
@@ -81,26 +79,27 @@ class DBClient {
                 throw 'xmlResult undefined';
             const tagXmlResult = (0, core_1.parseXML)('xmlResult', xmlResult);
             const objXmlResult = (await objectDataType.parseData(tagXmlResult, this.dbManager.scope));
-            const objectMeta = (objXmlResult.variables.getData('meta'));
-            if (objectMeta === undefined)
+            const metaObject = (objXmlResult.variables.getData('meta'));
+            if (metaObject === undefined)
                 throw 'objectMeta not found';
-            const xmlMeta = objectMeta.variables.getString(tableName);
-            if (xmlMeta === undefined)
-                throw 'meta does not have ' + tableName + ' description';
-            const tagDBTable = (0, core_1.parseXML)('dbTable', xmlMeta);
-            const dbTable = new core_1.DBTable(tagDBTable);
+            const typeObject = metaObject.variables.getData('resultset');
+            if (!typeObject || typeObject === null)
+                throw 'meta resultset not found';
+            if (typeObject.type.name !== 'type')
+                throw 'meta resulset is not type';
+            const objType = typeObject;
             const fields = options.fields.split(',');
             const list = new List();
             if (options.width !== undefined)
                 list.width = options.width;
             for (let ind = 0; ind < fields.length; ind++) {
                 const field = fields[ind];
-                const dbColumn = dbTable.columns.filter((dbColumn) => dbColumn.name === field)[0];
+                const dbColumn = objType.dbColumns?.columns.filter((dbColumn) => dbColumn.name === field)[0];
                 if (dbColumn === undefined)
                     throw 'field ' + field + ' not found';
                 list.addDBColumn(dbColumn);
             }
-            const objDataset = objXmlResult.variables.getData(tableName);
+            const objDataset = objXmlResult.variables.getData('resultset');
             for (let ind = 0; ind < objDataset.variables.length(); ind++) {
                 const variable = objDataset.variables.at(ind);
                 if (variable) {
@@ -129,6 +128,22 @@ class DBClient {
             logger.error(err);
         }
     }
+    /**
+     *
+     * @param sql
+     */
+    async runQuery(sql) {
+        try {
+            const request = new core_1.DBExecuteRequest();
+            const xml = `<query>
+            
+            </query>
+            `;
+        }
+        catch (err) {
+            logger.error(err);
+        }
+    }
 }
 exports.DBClient = DBClient;
 class List {
@@ -169,7 +184,7 @@ class List {
             }
             colws.push(colw);
         }
-        logger.debug('colws', colws.join(','));
+        // logger.debug('colws', colws.join(','))
         // calculate column.actualWidth
         let total_width = 0;
         for (let indi = 0; indi < this.columns.length; indi++) {

package/build/TableCommand.js

@@ -255,9 +255,13 @@ const commandImportExport = async (dbManager, direction, tables, options) => {
 // invoke local install of psql CLI
 //--------------------------------------------------------------------------------------------------------------------
 function psqlCmd(dbTable, direction, options) {
+    if (!dbTable.objectDataType)
+        throw 'dbTable.objectDataType undefind';
+    if (!dbTable.objectDataType.dbColumns)
+        throw 'dbTable.objectDataType.dbColumns undefined';
     let lcols;
-    for (let indj = 0; indj < dbTable.columns.length; indj++) {
-        const dbColumn = dbTable.columns[indj];
+    for (let indj = 0; indj < dbTable.objectDataType.dbColumns.columns.length; indj++) {
+        const dbColumn = dbTable.objectDataType.dbColumns.columns[indj];
         if (lcols === undefined) {
             lcols = "(";
         }

package/build/TableDataCommand.js

@@ -27,9 +27,13 @@ class TableDataCommand extends Cmd_1.Cmd {
             const dbTable = await this.dbManager.dbTableExist(table);
             if (dbTable === undefined)
                 throw 'table ' + table + ' not found';
+            if (!dbTable.objectDataType)
+                throw 'dbTable.objectDataType undefind';
+            if (!dbTable.objectDataType.dbColumns)
+                throw 'dbTable.objectDataType.dbColumns undefined';
             let fields = '';
-            for (let ind = 0; ind < dbTable.columns.length; ind++) {
-                const dbColumn = dbTable.columns[ind];
+            for (let ind = 0; ind < dbTable.objectDataType.dbColumns.columns.length; ind++) {
+                const dbColumn = dbTable.objectDataType.dbColumns.columns[ind];
                 let ok = false;
                 let fieldName = dbColumn.name;
                 if (dbColumn.dbType === 'text' || dbColumn.dbType === 'bytea') {
@@ -45,7 +49,7 @@ class TableDataCommand extends Cmd_1.Cmd {
                     fields += fieldName;
                 }
             }
-            TableCommand_1.logger.debug('commandQuery', table);
+            // logger.debug('commandData:', table, 'fields: ', fields);
             const dbClient = new DBClient_1.DBClient(this.dbManager);
             let title = 'Table ' + table;
             if (options.where !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.9.3",
+   "version": "0.11.1",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {
@@ -17,7 +17,7 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
-      "@cyklang/core": "^0.6.6",
+      "@cyklang/core": "^0.8.0",
       "commander": "^9.4.0",
       "dotenv": "^16.0.1",
       "form-data": "^4.0.0",

package/src/AssetCommand.ts

@@ -30,7 +30,7 @@ const scanAssets = async (dbManager: DBManager | undefined, dest?: string): Prom
     if (xmlResult === undefined || xmlResult === null) throw 'xmlResult null or undefined'
     const tag = parseXML('scanAssets', xmlResult)
     const objResult = await dbManager.scope.structure.objectDataType.parseData(tag, dbManager.scope) as ObjectData
-    const rows = (objResult.variables.getData('cyk_asset') as ObjectData).variables
+    const rows = (objResult.variables.getData('resultset') as ObjectData).variables
     for (let ind = 0; ind < rows.list.length; ind++) {
         const { variable: row } = rows.list[ind]
         const record = row.data as ObjectData
@@ -506,11 +506,10 @@ async function uploadAssetContent(dbAsset: DBAsset, fileName: string, dbRemote:
         const form = new FormData()
         form.append('uploadFile', file)
 
-        const route = '/api/upload/cyk_asset/asset_content?asset_id=' + dbAsset.id
+        const route = `/api/admin/assets/${dbAsset.id}/content`
         const resp = await dbRemote?.apiServer.post(route, form)
-        if (resp.status === 200) {
-            logger.info(fileName + ' uploaded')
-        }
+        logger.debug("metadata", resp)
+
     }
     catch (err) {
         logger.error(err)

package/src/DBClient.ts

@@ -1,4 +1,4 @@
-import { BasicType, DBColumn, DBExecuteRequest, DBManager, DBTable, ObjectData, parseXML, PrimitiveData, Script, variable2json, XmlError } from "@cyklang/core";
+import { BasicType, DBColumn, DBExecuteRequest, DBManager, DBTable, ObjectData, ObjectDataType, parseXML, PrimitiveData, Script, variable2json, XmlError } from "@cyklang/core";
 import loglevel from "loglevel";
 import { errorconsole } from "./console";
 const logger = loglevel.getLogger('DBClient.ts')
@@ -44,10 +44,6 @@ export class DBClient {
         }
     }
 
-    async runQuery() {
-
-    }
-
     async selectFromTable(title: string, tableName: string, options:
         { fields: string, sort?: string | undefined, where?: string | undefined, width?: string | undefined }): Promise<any[]> {
 
@@ -72,7 +68,7 @@ export class DBClient {
                     if (order_by !== '') order_by += ','
                     order_by += colname
                 }
-                logger.debug('order_by ' + order_by)
+                // logger.debug('order_by ' + order_by)
                 request.parameters.addVariable('order_by', stringDataType).data = new PrimitiveData(stringDataType, order_by)
             }
 
@@ -88,13 +84,12 @@ export class DBClient {
             const tagXmlResult = parseXML('xmlResult', xmlResult)
 
             const objXmlResult = (await objectDataType.parseData(tagXmlResult, this.dbManager.scope)) as ObjectData
-            const objectMeta = (objXmlResult.variables.getData('meta')) as ObjectData
-            if (objectMeta === undefined) throw 'objectMeta not found'
-            const xmlMeta = objectMeta.variables.getString(tableName)
-            if (xmlMeta === undefined) throw 'meta does not have ' + tableName + ' description'
-
-            const tagDBTable = parseXML('dbTable', xmlMeta)
-            const dbTable = new DBTable(tagDBTable)
+            const metaObject = (objXmlResult.variables.getData('meta')) as ObjectData
+            if (metaObject === undefined) throw 'objectMeta not found'
+            const typeObject = metaObject.variables.getData('resultset')
+            if (!typeObject || typeObject === null) throw 'meta resultset not found'
+            if (typeObject.type.name !== 'type') throw 'meta resulset is not type'
+            const objType = typeObject as ObjectDataType
 
             const fields = options.fields.split(',')
             const list = new List()
@@ -102,12 +97,12 @@ export class DBClient {
 
             for (let ind = 0; ind < fields.length; ind++) {
                 const field = fields[ind]
-                const dbColumn = dbTable.columns.filter((dbColumn) => dbColumn.name === field)[0]
+                const dbColumn = objType.dbColumns?.columns.filter((dbColumn) => dbColumn.name === field)[0]
                 if (dbColumn === undefined) throw 'field ' + field + ' not found'
                 list.addDBColumn(dbColumn)
             }
 
-            const objDataset = objXmlResult.variables.getData(tableName) as ObjectData
+            const objDataset = objXmlResult.variables.getData('resultset') as ObjectData
             for (let ind = 0; ind < objDataset.variables.length(); ind++) {
                 const variable = objDataset.variables.at(ind)
                 if (variable) {
@@ -142,6 +137,24 @@ export class DBClient {
         }
 
     }
+
+    /**
+     * 
+     * @param sql 
+     */
+    async runQuery(sql: string) {
+        try {
+            const request = new DBExecuteRequest()
+            const xml = `<query>
+            
+            </query>
+            `
+
+        }
+        catch (err) {
+            logger.error(err)
+        }
+    }
 }
 
 class List {
@@ -187,7 +200,7 @@ class List {
             colws.push(colw)
         }
 
-        logger.debug('colws', colws.join(','))
+        // logger.debug('colws', colws.join(','))
 
         // calculate column.actualWidth
         let total_width = 0

package/src/TableCommand.ts

@@ -249,9 +249,12 @@ const commandImportExport = async (dbManager: DBManager, direction: 'from' | 'to
 
 function psqlCmd(dbTable: DBTable, direction: 'from' | 'to', options: Options,) {
 
+    if (! dbTable.objectDataType ) throw 'dbTable.objectDataType undefind'
+    if (! dbTable.objectDataType.dbColumns ) throw 'dbTable.objectDataType.dbColumns undefined'
+
     let lcols: string | undefined
-    for (let indj = 0; indj < dbTable.columns.length; indj++) {
-        const dbColumn = dbTable.columns[indj]
+    for (let indj = 0; indj < dbTable.objectDataType.dbColumns.columns.length; indj++) {
+        const dbColumn = dbTable.objectDataType.dbColumns.columns[indj]
         if (lcols === undefined) {
             lcols = "("
         }

package/src/TableDataCommand.ts

@@ -26,11 +26,13 @@ export class TableDataCommand extends Cmd {
 
             const dbTable = await this.dbManager.dbTableExist(table);
             if (dbTable === undefined) throw 'table ' + table + ' not found';
+            if (! dbTable.objectDataType ) throw 'dbTable.objectDataType undefind'
+            if (! dbTable.objectDataType.dbColumns ) throw 'dbTable.objectDataType.dbColumns undefined'
 
             let fields = '';
 
-            for (let ind = 0; ind < dbTable.columns.length; ind++) {
-                const dbColumn = dbTable.columns[ind];
+            for (let ind = 0; ind < dbTable.objectDataType.dbColumns.columns.length; ind++) {
+                const dbColumn = dbTable.objectDataType.dbColumns.columns[ind];
                 let ok = false;
                 let fieldName = dbColumn.name;
                 if (dbColumn.dbType === 'text' || dbColumn.dbType === 'bytea') {
@@ -46,7 +48,7 @@ export class TableDataCommand extends Cmd {
                 }
             }
 
-            logger.debug('commandQuery', table);
+            // logger.debug('commandData:', table, 'fields: ', fields);
             const dbClient = new DBClient(this.dbManager);
             let title = 'Table ' + table;
             if (options.where !== undefined) {

package/test/db/t10.output

@@ -1,23 +1,4 @@
 New film ID 1
-films_actors.resultset.at(0).t_actor.last_name CHANE YOU KAYE
-actor 1 Maria CHANE YOU KAYE, film 1 La mélodie du bonheur
-string(films_actors.resultset) : <object>
-    <object name="t_actor">
-        <number name="actor_id">1</number>
-        <string name="first_name" literal="">Maria</string>
-        <string name="last_name" literal="">CHANE YOU KAYE</string>
-        <datetime name="last_update">
-        </datetime>
-        <string name="cyk_remark" literal="">remarque</string>
-        <boolean name="cyk_disable">
-        </boolean>
-    </object>
-    <object name="t_film">
-        <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>
-</object>
+films_actors.resultset.at(0).last_name DUPONT
+actor 1 Maria DUPONT, film 1 La mélodie du bonheur
+string(films_actors.resultset.at(0).title) : La mélodie du bonheur

package/test/db/t10.xml

@@ -2,28 +2,28 @@
 <module>
 
     <db.table name="t_actor">
-        <number name="actor_id" type="int" primary="" generated='by default'/>
-        <string name="first_name" type="varchar(50)"/>
-        <string name="last_name" type="text" />
-        <datetime name="last_update" type="timestamp with time zone"/>
-        <string name="cyk_remark" type="varchar(255)" />
-        <boolean name="cyk_disable" type="boolean"/>
+        <number name="actor_id" dbtype="int" primary="" generated='by default'/>
+        <string name="first_name" dbtype="varchar(50)"/>
+        <string name="last_name" dbtype="text" />
+        <datetime name="last_update" dbtype="timestamp with time zone"/>
+        <string name="cyk_remark" dbtype="varchar(255)" />
+        <boolean name="cyk_disable" dbtype="boolean"/>
     </db.table>
 
     <db.table name="t_film">
-        <number name="film_id" type="int" primary="" generated='by default'/>
-        <string name="title" type="varchar(255)" />
-        <string name="description" type="text" />
-        <number name="release_year" type="int"/>
-        <number name="length" type="int" />
-        <number name="language_id" type="int"/>
+        <number name="film_id" dbtype="int" primary="" generated='by default'/>
+        <string name="title" dbtype="varchar(255)" />
+        <string name="description" dbtype="text" />
+        <number name="release_year" dbtype="int"/>
+        <number name="length" dbtype="int" />
+        <number name="language_id" dbtype="int"/>
     </db.table>
 
     <db.table name="t_film_actor">
-        <number name="id" type="int" primary="" generated="by default"/>
-        <number name="actor_id" type="int"/>
-        <number name="film_id" type="int"/>
-        <number name="length" type="int"/>
+        <number name="id" dbtype="int" primary="" generated="by default"/>
+        <number name="actor_id" dbtype="int"/>
+        <number name="film_id" dbtype="int"/>
+        <number name="length" dbtype="int"/>
     </db.table>
 
     <query name="t_films_actors">
@@ -34,7 +34,7 @@
 
         <string name="entities">"t_actor t_film"</string>
         <string name="sql" literal="">
-            SELECT * FROM public.t_actor 
+            SELECT t_actor.*, t_film.* 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 }}
@@ -45,7 +45,7 @@
     
     <object name="actor_maria">
         <string name="first_name">"Maria" </string>
-        <string name='last_name'>'CHANE YOU KAYE'</string>
+        <string name='last_name'>'DUPONT'</string>
         <string name='cyk_remark'> 'remarque' </string>
     </object>
 
@@ -111,19 +111,19 @@
         <number name="length_to">60</number>
     </runquery>
 
-    <print>"films_actors.resultset.at(0).t_actor.last_name " + films_actors.resultset.at(0).t_actor.last_name</print>
+    <print>"films_actors.resultset.at(0).last_name " + films_actors.resultset.at(0).last_name</print>
     <call object="films_actors.resultset" method="foreach">
         <function>
             <object name="result" />
             <block>
-                <print>"actor " + result.t_actor.actor_id + " " + result.t_actor.first_name + " " + result.t_actor.last_name 
-                    + ", film " + result.t_film.film_id + " " + result.t_film.title 
+                <print>"actor " + result.actor_id + " " + result.first_name + " " + result.last_name 
+                    + ", film " + result.film_id + " " + result.title 
                 </print>
             </block>
         </function>
     </call>
 
-    <print>"string(films_actors.resultset) : "+string(films_actors.resultset)</print>
+    <print>"string(films_actors.resultset.at(0).title) : "+string(films_actors.resultset.at(0).title)</print>
 
 
 </module>

package/test/db/t13.xml

@@ -17,7 +17,7 @@
                 </object>
                 <string name="entities">"t_actor t_film"</string>
                 <string name="sql" literal="">
-                    SELECT * FROM public.t_actor 
+                    SELECT t_actor.*, t_film.* 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 }}

package/test/db/t14.output

@@ -35,6 +35,8 @@ actress <number name="actor_id">
 </string>
 <boolean name="cyk_disable">
 </boolean>
+<object name="t_actor__meta">
+</object>
 user1 <number name="user_id">
 </number>
 <string name="user_name">
@@ -50,3 +52,5 @@ user1 <number name="user_id">
 <boolean name="user_disable">false</boolean>
 <string name="user_lang">
 </string>
+<object name="cyk_user__meta">
+</object>

package/test/db/t15.output

@@ -5,6 +5,6 @@ test de if()
     <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>
+    <string name="last_name" literal="">DUPONT</string>
 </object>
 actors_by_film.resultset.length(): 1

package/test/db/t20.xml

@@ -28,4 +28,9 @@
         </block>
     </function>
 
+    <type name="Dossier">
+        <number name="id"/>
+        <string name="libelle"/>
+    </type>
+
 </module>

package/test/db/t21.output

@@ -21,3 +21,11 @@ chaine : 150
 </datetime>
 <datetime name="dtnull1">
 </datetime>
+string(dossier): <number name="id">
+</number>
+<string name="libelle">
+</string>
+string(presta): <number name="pst_id">
+</number>
+<string name="pst_libelle">
+</string>

package/test/db/t21.xml

@@ -98,4 +98,16 @@
     <print>string(document)</print>
     <print>string(object(string(document)))</print>
 
+    <object type="m_t20.Dossier" name="dossier"/>
+    <print>"string(dossier): " + string(dossier)</print>
+
+    <object name="dcl">
+        <type name="Prestation">
+            <number name="pst_id"/>
+            <string name="pst_libelle"/>
+        </type>
+    </object>
+    <object type="dcl.Prestation" name="presta"/>
+    <print>"string(presta): " + string(presta)</print>
+
 </module>

package/test/db/t22.xml

@@ -6,13 +6,13 @@
             <object name="result_t_actor"/>
             <db.select table="t_actor" result="result_t_actor"/>
             <!-- <db.execute select_from_table="t_actor" result="result_t_actor"/> -->
-
+            <print>"result_t_actor: " + string(result_t_actor)</print>
             <object name="result_">
                 <string name="name">"CYK"</string>
                 <string name="surname">"Philippe"</string>
-                <object name="t_actor">result_t_actor.t_actor</object>
+                <object name="t_actor">result_t_actor.resultset</object>
                 <object name="meta">
-                    <string name="t_actor">result_t_actor.meta.t_actor</string>
+                    <string name="t_actor">result_t_actor.meta.resultset</string>
                 </object>
             </object>
             <set name="result">result_</set>

package/test/db/t29.output

@@ -0,0 +1,15 @@
+leo: <number name="actor_id">
+</number>
+<string name="first_name">
+</string>
+<string name="last_name">
+</string>
+<datetime name="last_update">
+</datetime>
+<string name="cyk_remark">
+</string>
+<boolean name="cyk_disable">
+</boolean>
+<object name="t_actor__meta">
+</object>
+result: Leonardo

package/test/db/t29.xml

@@ -0,0 +1,13 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<module>
+    <object name="leo">
+                newDBRow("t_actor")
+    </object>
+    <print>"leo: " + string(leo)</print>
+    <set name="leo.first_name">"Leonardo"</set>
+    <set name="leo.last_name">"DI CAPRIO"</set>
+    <object name="result"/>
+    <call object="leo" method="dbinsert" returns="result"/>
+    <print>"result: " + string(result.first_name)</print>
+    <!-- <print>"objson: " + objson(result)</print> -->
+</module>

package/test/db/t30.xml

@@ -0,0 +1,15 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
+<module>
+    <db.table name="cook_genre">
+        <string name="genre_name" primary=""/>
+    </db.table>
+
+    <db.table name="cook_recipe">
+        <number name="rcp_id" dbtype="int" generated="by default" label="ID recette" primary=""/>
+        <string name="rcp_name" label="Recette"/>
+        <string name="rcp_genre" label="Genre"/>
+        <foreignkey parent="cook_genre">
+            <string name="genre_name">"rcp_genre"</string>
+        </foreignkey>
+    </db.table>
+</module>

package/test/t0.xml

@@ -1,5 +1,5 @@
 <block>
-    <type name="dossier">
+    <type name="Dossier">
         <number name="id" />
         <string name="libelle" />
     </type>
@@ -16,7 +16,7 @@
     <print>"28" + "12"</print>
     <print>28 + 12</print>
 
-    <dossier name="dos1" />
+    <object type="Dossier" name="dos1" />
 
 
     <let name="dos1.id">1</let>

package/test/t01.output

@@ -1,6 +1,6 @@
 ******* Mon nom est Dossier DUPONT id 1
 Dossier remorquage : DURAND lieu Saint-Denis
-then dos2.libelle == DURAND
+then dos2.dos_libelle == DURAND
 Nested block dos1.id 1
 *** Function add BEGIN a 150 b 300
 else a gt b
@@ -27,7 +27,7 @@ factorielle de 5 : 120
 PST1 id=100 libelle=Prestation 1
 PST2 id=100 libelle=Prestation 2
 PST1 id=100 libelle=Prestation 2
-dos1.prestation.libelle = Prestation 2
+dos1.prestation.pst_libelle = Prestation 2
 sum 150
 sum 50
 sum 10
@@ -41,53 +41,73 @@ dos3 300 dossier 300
 <number name="id">1000</number>
 <string name="libelle" literal="">libellé dossier</string>
 Vidage de l'object pst1 :
-name id, value 100
-name libelle, value Prestation 2
+name pst_id, value 100
+name pst_libelle, value Prestation 2
 v_obj.nested.member = 888
 list: <object type="dossier">
-    <number name="id">1</number>
-    <string name="libelle" literal="">Dossier DUPONT</string>
+    <number name="dos_id">1</number>
+    <string name="dos_libelle" literal="">Dossier DUPONT</string>
     <object name="prestation" type="prestation">
-        <number name="id">100</number>
-        <string name="libelle" literal="">Prestation 2</string>
+        <number name="pst_id">100</number>
+        <string name="pst_libelle" literal="">Prestation 2</string>
     </object>
 </object>
 <object type="dossier_remorquage">
-    <number name="id">2</number>
-    <string name="libelle" literal="">DURAND</string>
+    <number name="dos_id">2</number>
+    <string name="dos_libelle" literal="">DURAND</string>
     <object name="prestation" type="prestation">
-        <number name="id">
-        </number>
-        <string name="libelle">
-        </string>
     </object>
-    <string name="lieu" literal="">Saint-Denis</string>
+    <string name="dos_lieu" literal="">Saint-Denis</string>
 </object>
 <object type="dossier">
-    <number name="id">300</number>
-    <string name="libelle" literal="">dossier 300</string>
+    <number name="dos_id">300</number>
+    <string name="dos_libelle" literal="">dossier 300</string>
     <object name="prestation" type="prestation">
-        <number name="id">
-        </number>
-        <string name="libelle">
-        </string>
     </object>
 </object>
 <object name="dossier_vide" type="dossier">
-    <number name="id">
+    <number name="dos_id">
     </number>
-    <string name="libelle">
+    <string name="dos_libelle">
     </string>
     <object name="prestation" type="prestation">
-        <number name="id">
-        </number>
-        <string name="libelle">
-        </string>
     </object>
 </object>
-list.at(0): <number name="id">1</number>
-<string name="libelle" literal="">Dossier DUPONT</string>
+list.at(0): <number name="dos_id">1</number>
+<string name="dos_libelle" literal="">Dossier DUPONT</string>
 <object name="prestation" type="prestation">
-    <number name="id">100</number>
-    <string name="libelle" literal="">Prestation 2</string>
+    <number name="pst_id">100</number>
+    <string name="pst_libelle" literal="">Prestation 2</string>
+</object>
+meta(dossier): <columns>
+    <number name="dos_id">
+    </number>
+    <string name="dos_libelle">
+    </string>
+    <prestation name="prestation">
+    </prestation>
+</columns>
+meta(dossier_remorquage): <columns>
+    <string name="dos_lieu">
+    </string>
+</columns>
+dos4: <number name="dos_id">
+</number>
+<string name="dos_libelle">
+</string>
+<object name="prestation" type="prestation">
+</object>
+pst4: <number name="pst_id">
+</number>
+<string name="pst_libelle">
+</string>
+dos4: <number name="dos_id">
+</number>
+<string name="dos_libelle">
+</string>
+<object name="prestation" type="prestation">
+    <number name="pst_id">
+    </number>
+    <string name="pst_libelle">
+    </string>
 </object>

package/test/t01.xml

@@ -2,16 +2,16 @@
 <module>
 
     <type name="prestation">
-        <number name="id"/>
-        <string name="libelle"/>
+        <number name="pst_id"/>
+        <string name="pst_libelle"/>
     </type>
     <type name="dossier">
-        <number name="id" />
-        <string name="libelle" />
+        <number name="dos_id" />
+        <string name="dos_libelle" />
         <object type="prestation" name="prestation" />
     </type>
     <type name="dossier_remorquage" base="dossier">
-        <string name="lieu" />
+        <string name="dos_lieu" />
     </type>
 
     <function name="add" returns="c: number">
@@ -54,34 +54,34 @@
         </block>
     </function>
     <object type="dossier" name="dos1">
-        <number name="id">1</number>
-        <string name="libelle">"Dossier DUPONT"</string>
+        <number name="dos_id">1</number>
+        <string name="dos_libelle">"Dossier DUPONT"</string>
     </object>
     <!-- <let name="dos1.id">1</let>
         <let name="dos1.libelle">"DUPONT"</let> -->
-    <print>"******* Mon nom est " + dos1.libelle + " id " + dos1.id</print>
+    <print>"******* Mon nom est " + dos1.dos_libelle + " id " + dos1.dos_id</print>
     <object type="dossier_remorquage" name="dos2">
-        <number name="id">2</number>
+        <number name="dos_id">2</number>
     </object>
-    <let name="dos2.libelle">"DURAND"</let>
-    <let name="dos2.lieu">"Saint-Denis"</let>
-    <print>"Dossier remorquage : " + dos2.libelle + " lieu " + dos2.lieu</print>
+    <let name="dos2.dos_libelle">"DURAND"</let>
+    <let name="dos2.dos_lieu">"Saint-Denis"</let>
+    <print>"Dossier remorquage : " + dos2.dos_libelle + " lieu " + dos2.dos_lieu</print>
     <!-- <let name="dos1.lieu">"toto"</let> -->
     <if>
-        <condition><![CDATA[ dos1.id == 2 ]]></condition>
+        <condition><![CDATA[ dos1.dos_id == 2 ]]></condition>
         <then>
-            <print>"then de dos1.id == 1"</print>
+            <print>"then de dos1.dos_id == 1"</print>
         </then>
-        <condition>dos2.libelle == "DURAND"</condition>
+        <condition>dos2.dos_libelle == "DURAND"</condition>
         <then>
-            <print>"then dos2.libelle == DURAND"</print>
+            <print>"then dos2.dos_libelle == DURAND"</print>
         </then>
         <else>
             <print>"CASE else"</print>
         </else>
     </if>
     <block>
-        <print>"Nested block dos1.id " + dos1.id </print>
+        <print>"Nested block dos1.id " + dos1.dos_id </print>
     </block>
     <number name="result"/>
     <call function="add" returns="result">
@@ -100,19 +100,19 @@
     <print>"factorielle de " + Nombre + " = " + result</print>
     <print>"factorielle de 5 : " + fact(5)</print>
     <object type="prestation" name="pst1">
-        <number name="id">100</number>
-        <string name="libelle">"Prestation 1"</string>
+        <number name="pst_id">100</number>
+        <string name="pst_libelle">"Prestation 1"</string>
     </object>
     <object type="prestation" name="pst2">
     </object>
 
-    <print>"PST1 id="+pst1.id +" libelle="+pst1.libelle</print>
+    <print>"PST1 id="+pst1.pst_id +" libelle="+pst1.pst_libelle</print>
     <let name="pst2">pst1</let>
-    <let name="pst2.libelle">"Prestation 2"</let>
-    <print>"PST2 id="+pst2.id +" libelle="+pst2.libelle</print>
-    <print>"PST1 id="+pst1.id +" libelle="+pst1.libelle</print>
+    <let name="pst2.pst_libelle">"Prestation 2"</let>
+    <print>"PST2 id="+pst2.pst_id +" libelle="+pst2.pst_libelle</print>
+    <print>"PST1 id="+pst1.pst_id +" libelle="+pst1.pst_libelle</print>
     <let name="dos1.prestation">pst1</let>
-    <print>"dos1.prestation.libelle = "+dos1.prestation.libelle</print>
+    <print>"dos1.prestation.pst_libelle = "+dos1.prestation.pst_libelle</print>
 
     <object name="numbers">
         <number>150</number>
@@ -168,11 +168,11 @@
         <print>"total du tableau = "+total</print> -->
 
     <object type="dossier" name="dos3">
-        <number name="id">300</number>
-        <string name="libelle">"dossier 300"</string>
+        <number name="dos_id">300</number>
+        <string name="dos_libelle">"dossier 300"</string>
     </object>
 
-    <print>"dos3 " + dos3.id + " " + dos3.libelle</print>
+    <print>"dos3 " + dos3.dos_id + " " + dos3.dos_libelle</print>
 
     <string name="xml" literal=""><![CDATA[ 
         <number name="id">1000</number>
@@ -239,4 +239,24 @@
 
     <print>"meta(dossier): " +meta("dossier")</print>
     <print>"meta(dossier_remorquage): " + meta("dossier_remorquage")</print>
+
+    <!-- <function name="fct">
+        <object type="type"/>
+        <block>
+            <object name="obj">newobject(type)</object>
+            <print>"obj: " + string(obj)</print>
+        </block>
+    </function> -->
+
+    <!-- <call function="fct">
+        <object name="type">gettype(prestation)</object>
+    </call> -->
+ 
+    <object name="dos4" type="dossier"/>
+    <object name="pst4" type="prestation"/>
+    <print>"dos4: " + string(dos4)</print>
+    <print>"pst4: " + string(pst4)</print>
+    <set name="dos4.prestation">pst4</set>
+    <print>"dos4: " + string(dos4)</print>
+
 </module>

package/test/t07.xml

@@ -3,35 +3,36 @@
     <print>"begin"</print>
     <number name="jean">12345</number>
     <type name="form"/>
-    <type name="form.grid" />
-    <type name="form.field"/>
-    <type name="form.input" />
-    <type name="form.button" />
-    <type name="form.onclick"/>
-    <type name="form.template" literal=""/>
+    <type name="grid" />
+    <type name="field"/>
+    <type name="input" />
+    <type name="button" />
+    <type name="template" literal=""/>
+
     <form name="ident_form">
         <string name="tip">"information"</string>
-        <grid template-columns="1fr 1fr" column="1 / 3">
+        <grid grid-template-columns="1fr 1fr" grid-column="1 / 3">
             <input model="v1"></input>
         </grid>
         <input model="surname" label="Surname" />
         <input model="name" label="Name" />
         <button label="OK" icon="done">
-            <onclick>
+            <function name="onclick">
+                <block></block>
                 <!-- <closeform/> -->
-            </onclick>
+            </function>
         </button>
     </form>
     <print>"ident_form.tip " + ident_form.tip</print>
     <form name="f1">ident_form</form>
     <print>"f1.tip " + f1.tip</print>
-    
-    <form name="form1" template-columns="auto auto">
+
+    <form name="form1" grid-template-columns="auto auto">
         <string name="tip">"information"</string>
         <input model="v1" bg-color="green-1" label="Label Version" stack-label="" hint="Hint info V1" autogrow=""></input>
         <input model="v1" label="Label V1" stack-label="" hint="Hint V1" type="textarea"></input>
 
-        <grid template-columns="1fr 1fr" column="1 / 3">
+        <grid grid-template-columns="1fr 1fr" grid-column="1 / 3">
             <input model="v1"></input>
         </grid>
 
@@ -68,13 +69,13 @@
         <input model="numb" label="Number" stack-label="" type="number"></input>
 
         <button label="Ok" icon="event">
-            <onclick>
-                <function>
-                    <block>
-                        <print>"toto"</print>
-                    </block>
-                </function>
-            </onclick>
+
+            <function name="onclick">
+                <block>
+                    <print>"toto"</print>
+                </block>
+            </function>
+
         </button>
     </form>
     <print>"form1.tip " + form1.tip</print>

package/test/t11.xml

@@ -1,4 +1,4 @@
-<?xml-model href="cyklang.xsd" ?>
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" ?>
 <module>
     <type name="point">
         <number name="x">0</number>

package/test/t28.output

@@ -0,0 +1,4 @@
+chaine_vide: undefined
+chaine_vide: undefined
+[ ! chaine_vide ] is true
+! nombre_vide false

package/test/t28.xml

@@ -0,0 +1,27 @@
+<?xml-model href="https://www.cyklang.net/schema/cyklang.xsd" type="application/xml" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<module>
+
+    <string name="chaine_vide"/>
+    <print>"chaine_vide: " + chaine_vide</print>
+    <if>
+        <condition>! chaine_vide </condition>
+        <then>
+            <print>"chaine_vide: " +chaine_vide</print>
+            <print>"[ ! chaine_vide ] is true"</print>
+        </then>
+        <else>
+            <print>"[ ! chaine_vide ] is false"</print>
+        </else>
+    </if>
+
+    <number name="nombre_vide">1</number>
+    <if>
+        <condition>! nombre_vide</condition>
+        <then>
+            <print>"! nombre_vide true"</print>
+        </then>
+        <else>
+            <print>"! nombre_vide false"</print>
+        </else>
+    </if>
+</module>

package/test/db/test_schema.xml

@@ -1,15 +0,0 @@
-<?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>