@cyklang/cli 0.14.16 → 0.14.18

package/build/RunCommand.js

@@ -85,21 +85,7 @@ async function runFile(filename) {
         const login = await dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);
         const dbManager = new core_1.DBManager(structure.scope, dbRemote);
         await dbManager.initialize();
-        const user_lang = login.content.user_lang;
-        if (user_lang && user_lang.trim() !== '') {
-            const langfilename = filename + "__" + user_lang + ".xml";
-            if (fs.existsSync(langfilename)) {
-                const langXml = fs.readFileSync(langfilename);
-                const tag = (0, core_1.parseXML)(xmlfilename, langXml.toString());
-                const modLang = new core_1.ModuleInstruction(tag, dbManager);
-                await modLang.parse(structure.scope);
-                await modLang.execute(structure.scope);
-                const langMap = modLang.objectData?.variables.getData(user_lang);
-                if (langMap !== null && langMap !== undefined) {
-                    await structure.scope.setLang(user_lang, langMap);
-                }
-            }
-        }
+        await (0, core_1.loadLanguageModule)(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG]);
         let script = new core_1.Script(structure.scope, xmlfilename, xml.toString(), dbManager);
         await script.parseInstructions();
         await script.execute();

package/build/TestCommand.js

@@ -86,23 +86,8 @@ async function testfile(filename) {
         const dbManager = new core_1.DBManager(structure.scope, dbRemote);
         await dbManager.initialize();
         structure.scope.addInstructionType(new console_1.PrintInstructionType(logfilename));
+        await (0, core_1.loadLanguageModule)(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG]);
         let script = new core_1.Script(structure.scope, xmlfilename, xml.toString(), dbManager);
-        const user_lang = login.content.user_lang;
-        if (user_lang && user_lang.trim() !== '') {
-            const langfilename = filename + "__" + user_lang + ".xml";
-            if (fs.existsSync(langfilename)) {
-                const langXml = fs.readFileSync(langfilename);
-                const tag = (0, core_1.parseXML)(xmlfilename, langXml.toString());
-                const modLang = new core_1.ModuleInstruction(tag, dbManager);
-                await modLang.parse(structure.scope);
-                await modLang.execute(structure.scope);
-                const langMap = modLang.objectData?.variables.getData(user_lang);
-                if (langMap !== null && langMap !== undefined) {
-                    await structure.scope.setLang(user_lang, langMap);
-                    outfilename = filename + "__" + user_lang + ".output";
-                }
-            }
-        }
         await script.parseInstructions();
         await script.execute();
         // console.log(JSON.stringify(script.block.toString()))

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

package/src/RunCommand.ts

@@ -1,4 +1,4 @@
-import { Structure, Script, XmlError, DBRemote, DBManager, ModuleInstruction, parseXML, MapData } from "@cyklang/core"
+import { Structure, Script, XmlError, DBRemote, DBManager, ModuleInstruction, parseXML, MapData, loadLanguageModule } from "@cyklang/core"
 import * as fs from "fs"
 import { errorconsole, PrintInstructionType } from "./console"
 import loglevel from 'loglevel'
@@ -61,25 +61,7 @@ export async function runFile(filename: string): Promise<void> {
         const dbManager = new DBManager(structure.scope, dbRemote)
         await dbManager.initialize()
 
-        const user_lang = login.content.user_lang
-        if (user_lang && user_lang.trim() !== '') {
-
-            const langfilename = filename + "__" + user_lang + ".xml"
-
-            if (fs.existsSync(langfilename)) {
-                const langXml = fs.readFileSync(langfilename)
-                const tag = parseXML(xmlfilename, langXml.toString())
-                const modLang = new ModuleInstruction(tag, dbManager)
-                await modLang.parse(structure.scope)
-                await modLang.execute(structure.scope)
-
-                const langMap = modLang.objectData?.variables.getData(user_lang)
-
-                if (langMap !== null && langMap !== undefined) {
-                    await structure.scope.setLang(user_lang, langMap as MapData)
-                }
-            }
-        }
+        await loadLanguageModule(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG])
 
         let script = new Script(structure.scope, xmlfilename, xml.toString(), dbManager)
         await script.parseInstructions()

package/src/TestCommand.ts

@@ -1,4 +1,4 @@
-import { Structure, Script, XmlError, DBRemote, DBManager, MapData, ModuleInstruction, parseXML } from "@cyklang/core"
+import { Structure, Script, XmlError, DBRemote, DBManager, MapData, ModuleInstruction, parseXML, loadLanguageModule } from "@cyklang/core"
 import * as fs from "fs"
 import { errorconsole, PrintInstructionType } from "./console"
 import loglevel from 'loglevel'
@@ -64,28 +64,10 @@ async function testfile(filename: string): Promise<boolean> {
         const dbManager = new DBManager(structure.scope, dbRemote)
         await dbManager.initialize()
         structure.scope.addInstructionType(new PrintInstructionType(logfilename))
-        let script = new Script(structure.scope, xmlfilename, xml.toString(), dbManager)
-        const user_lang = login.content.user_lang
-        if (user_lang && user_lang.trim() !== '') {
-
-            const langfilename = filename + "__" + user_lang + ".xml"
-
-            if (fs.existsSync(langfilename)) {
-                const langXml = fs.readFileSync(langfilename)
-                const tag = parseXML(xmlfilename, langXml.toString())
-                const modLang = new ModuleInstruction(tag, dbManager)
-                await modLang.parse(structure.scope)
-                await modLang.execute(structure.scope)
-
-                const langMap = modLang.objectData?.variables.getData(user_lang)
 
-                if (langMap !== null && langMap !== undefined) {
-                    await structure.scope.setLang(user_lang, langMap as MapData)
+        await loadLanguageModule(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG])
 
-                    outfilename = filename + "__" + user_lang + ".output"
-                }
-            }
-        }
+        let script = new Script(structure.scope, xmlfilename, xml.toString(), dbManager)
 
         await script.parseInstructions()
         await script.execute()

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.16')
+    .version('0.14.18')
 program.addCommand(new StartCommand('start'))
 program.addCommand(new StopCommand('stop'))
 program.addCommand(new InstallCommand('install'))

package/test/t34.output

@@ -0,0 +1,16 @@
+<Exercice> <Journal> Contenu du Journal </Journal> <Journal> Contenu du Journal </Journal> </Exercice>
+encodexml() : Frais postaux et de Télécom.
+dialog.__dirty__ = false
+dialog.d1 = 10
+dialog.grid.g1 = 20
+dialog=<boolean name="__dirty__">false</boolean>
+<number name="d1">10</number>
+<object name="grid">
+    <number name="g1">20</number>
+    <function name="f1" returns="result:number">
+    </function>
+    <boolean name="boole">false</boolean>
+</object>
+dialog.grid.f1() = 50
+dialog.grid.boole = false
+dialog2.__dirty__ = false

package/test/t34.xml

@@ -71,4 +71,40 @@
 
     <print>"encodexml() : " + encodexml("Frais postaux et de Télécom.")</print>
 
+    <boolean name="bool">true</boolean>
+
+    <type name="TDialog">
+        <method name="__init__">
+            <block>
+                <call object="this" method="push">
+                    <boolean name="__dirty__">false</boolean>
+                </call>
+            </block>
+        </method>
+    </type>
+
+    <object name="dialog" type="TDialog">
+        <number name="d1">10</number>
+        <object name="grid">
+            <number name="g1"> 2 * d1</number>
+            <function name="f1" returns="result: number">
+                <block>
+                    <set name="result">2 * grid.g1 + dialog.d1</set>
+                    <print>"dialog=" + string(dialog)</print>
+                </block>
+            </function>
+            <boolean name="boole"> false </boolean>
+        </object>
+    </object>
+
+    <print>"dialog.__dirty__ = " + dialog.__dirty__</print>
+    <print>"dialog.d1 = " + dialog.d1</print>
+    <print>"dialog.grid.g1 = " + dialog.grid.g1</print>
+    <print>"dialog.grid.f1() = " + dialog.grid.f1()</print>
+    <print>"dialog.grid.boole = " + dialog.grid.boole</print>
+
+    <object name="dialog2" type="TDialog"></object>
+    <print>"dialog2.__dirty__ = " + dialog2.__dirty__</print>
+
+   
 </module>