@cyklang/cli 0.14.11 → 0.14.12

package/build/DBClient.js

@@ -31,7 +31,7 @@ class DBClient {
      */
     async execScript(source) {
         try {
-            const script = new core_1.Script(this.dbManager.scope, '', source);
+            const script = new core_1.Script(this.dbManager.scope, '', source, this.dbManager);
             await script.parseInstructions();
             await script.execute();
         }

package/build/RunCommand.js

@@ -96,11 +96,11 @@ async function runFile(filename) {
                 await modLang.execute(structure.scope);
                 const langMap = modLang.objectData?.variables.getData(user_lang);
                 if (langMap !== null && langMap !== undefined) {
-                    structure.mapLang = langMap;
+                    await structure.setLang(user_lang, langMap);
                 }
             }
         }
-        let script = new core_1.Script(structure.scope, xmlfilename, xml.toString());
+        let script = new core_1.Script(structure.scope, xmlfilename, xml.toString(), dbManager);
         await script.parseInstructions();
         await script.execute();
     }

package/build/TestCommand.js

@@ -86,7 +86,7 @@ async function testfile(filename) {
         const dbManager = new core_1.DBManager(structure.scope, dbRemote);
         await dbManager.initialize();
         structure.scope.addInstructionType(new console_1.PrintInstructionType(logfilename));
-        let script = new core_1.Script(structure.scope, xmlfilename, xml.toString());
+        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";
@@ -98,7 +98,7 @@ async function testfile(filename) {
                 await modLang.execute(structure.scope);
                 const langMap = modLang.objectData?.variables.getData(user_lang);
                 if (langMap !== null && langMap !== undefined) {
-                    structure.mapLang = langMap;
+                    await structure.setLang(user_lang, langMap);
                     outfilename = filename + "__" + user_lang + ".output";
                 }
             }

package/package.json

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

package/src/DBClient.ts

@@ -29,7 +29,7 @@ export class DBClient {
      */
     async execScript(source: string) {
         try {
-            const script = new Script(this.dbManager.scope, '', source)
+            const script = new Script(this.dbManager.scope, '', source, this.dbManager)
             await script.parseInstructions()
             await script.execute()
         }

package/src/RunCommand.ts

@@ -76,12 +76,12 @@ export async function runFile(filename: string): Promise<void> {
                 const langMap = modLang.objectData?.variables.getData(user_lang)
 
                 if (langMap !== null && langMap !== undefined) {
-                    structure.mapLang = langMap as MapData
+                    await structure.setLang(user_lang, langMap as MapData)
                 }
             }
         }
 
-        let script = new Script(structure.scope, xmlfilename, xml.toString())
+        let script = new Script(structure.scope, xmlfilename, xml.toString(), dbManager)
         await script.parseInstructions()
         await script.execute()
     }

package/src/TestCommand.ts

@@ -64,7 +64,7 @@ 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())
+        let script = new Script(structure.scope, xmlfilename, xml.toString(), dbManager)
         const user_lang = login.content.user_lang
         if (user_lang && user_lang.trim() !== '') {
 
@@ -80,7 +80,7 @@ async function testfile(filename: string): Promise<boolean> {
                 const langMap = modLang.objectData?.variables.getData(user_lang)
 
                 if (langMap !== null && langMap !== undefined) {
-                    structure.mapLang = langMap as MapData
+                    await structure.setLang(user_lang, langMap as MapData)
 
                     outfilename = filename + "__" + user_lang + ".output"
                 }

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

package/test/t31.output

@@ -15,9 +15,9 @@ v.AD = 1400
 v.AC = 200
 v.AD = 1300
 v = <object>
-    <number name="_010_">1000</number>
-    <number name="AA">2500</number>
-    <number name="AB">500</number>
-    <number name="AC">200</number>
-    <number name="AD">1300</number>
+	<number name="_010_">1000</number>
+	<number name="AA">2500</number>
+	<number name="AB">500</number>
+	<number name="AC">200</number>
+	<number name="AD">1300</number>
 </object>