@cyklang/cli 0.16.1 → 0.17.1

package/build/RunCommand.js

@@ -86,6 +86,7 @@ async function runFile(filename) {
         const dbManager = new core_1.DBManager(structure.scope, dbRemote);
         await dbManager.initialize();
         structure.scope.addInstructionType(new console_1.WriteFileInstructionType("write_file"));
+        structure.scope.addFunction('read_file', console_1.read_file);
         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();

package/build/TestCommand.js

@@ -87,6 +87,7 @@ async function testfile(filename) {
         await dbManager.initialize();
         structure.scope.addInstructionType(new console_1.PrintInstructionType(logfilename));
         structure.scope.addInstructionType(new console_1.WriteFileInstructionType("write_file"));
+        structure.scope.addFunction('read_file', console_1.read_file);
         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();

package/build/console.d.ts

@@ -1,6 +1,6 @@
-import { XmlError } from '@cyklang/core';
+import { Variables, XmlError } from '@cyklang/core';
 import { Instruction, InstructionType, Tag } from '@cyklang/core';
-import { Scope } from '@cyklang/core';
+import { Data, Scope } from '@cyklang/core';
 export declare function errorconsole(xmlError: XmlError): void;
 export declare class InputInstructionType extends InstructionType {
     constructor();
@@ -11,6 +11,13 @@ export declare class PrintInstructionType extends InstructionType {
     constructor(logfilename: string);
     parseInstruction(tag: Tag, scope: Scope): Promise<Instruction>;
 }
+/**
+ *
+ * @param params
+ * @param callerScope
+ * @returns
+ */
+export declare function read_file(params: Variables, callerScope: Scope): Promise<Data | undefined>;
 /**
  *
  */

package/build/console.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WriteFileInstructionType = exports.PrintInstructionType = exports.InputInstructionType = exports.errorconsole = void 0;
+exports.WriteFileInstructionType = exports.read_file = exports.PrintInstructionType = exports.InputInstructionType = exports.errorconsole = void 0;
 const core_1 = require("@cyklang/core");
 const fs = __importStar(require("fs"));
 const core_2 = require("@cyklang/core");
@@ -112,6 +112,34 @@ class PrintInstruction extends core_2.Instruction {
     dump() {
     }
 }
+/**
+ *
+ * @param params
+ * @param callerScope
+ * @returns
+ */
+async function read_file(params, callerScope) {
+    try {
+        let result = callerScope.structure.undefinedData;
+        if (params.length() === 0)
+            throw 'needs filename to read';
+        const param1 = params.at(0);
+        if (param1 === undefined)
+            throw 'filename is undefined';
+        const pathname = param1.variable.getString();
+        if (pathname === undefined)
+            throw 'pathname is undefined';
+        const buffer = fs.readFileSync(pathname);
+        const bufferData = new core_1.BufferData(callerScope.structure.bufferDataType);
+        bufferData.buffer = buffer;
+        result = bufferData;
+        return result;
+    }
+    catch (err) {
+        throw `read_file() error : ${err}`;
+    }
+}
+exports.read_file = read_file;
 /**
  *
  */

package/package.json

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

package/src/RunCommand.ts

@@ -1,6 +1,6 @@
 import { Structure, Script, XmlError, DBRemote, DBManager, ModuleInstruction, parseXML, MapData, loadLanguageModule } from "@cyklang/core"
 import * as fs from "fs"
-import { errorconsole, PrintInstructionType, WriteFileInstructionType } from "./console"
+import { errorconsole, PrintInstructionType, read_file, WriteFileInstructionType } from "./console"
 import loglevel from 'loglevel'
 import { NodeCrypto } from "./NodeCrypto"
 import { Cmd } from "./Cmd"
@@ -61,6 +61,7 @@ export async function runFile(filename: string): Promise<void> {
         const dbManager = new DBManager(structure.scope, dbRemote)
         await dbManager.initialize()
         structure.scope.addInstructionType(new WriteFileInstructionType("write_file"))
+        structure.scope.addFunction('read_file', read_file)
 
         await loadLanguageModule(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG])
 

package/src/TestCommand.ts

@@ -1,6 +1,6 @@
 import { Structure, Script, XmlError, DBRemote, DBManager, MapData, ModuleInstruction, parseXML, loadLanguageModule } from "@cyklang/core"
 import * as fs from "fs"
-import { errorconsole, PrintInstructionType, WriteFileInstructionType } from "./console"
+import { errorconsole, PrintInstructionType, read_file, WriteFileInstructionType } from "./console"
 import loglevel from 'loglevel'
 import { NodeCrypto } from "./NodeCrypto"
 import { Cmd } from "./Cmd"
@@ -65,6 +65,8 @@ async function testfile(filename: string): Promise<boolean> {
         await dbManager.initialize()
         structure.scope.addInstructionType(new PrintInstructionType(logfilename))
         structure.scope.addInstructionType(new WriteFileInstructionType("write_file"))
+        structure.scope.addFunction('read_file', read_file)
+        
 
         await loadLanguageModule(structure.scope, dbManager, '', [login.content.user_lang, process.env.LANG])
 

package/src/console.ts

@@ -1,4 +1,4 @@
-import { BufferData, Jump, ObjectData, XmlError } from '@cyklang/core'
+import { BufferData, Jump, ObjectData, Variables, XmlError } from '@cyklang/core'
 import * as fs from "fs"
 import { Instruction, InstructionType, Tag } from '@cyklang/core'
 import { Data, Scope } from '@cyklang/core'
@@ -97,6 +97,32 @@ class PrintInstruction extends Instruction {
     }
 }
 
+/**
+ * 
+ * @param params 
+ * @param callerScope 
+ * @returns 
+ */
+export async function read_file(params: Variables, callerScope: Scope): Promise<Data | undefined> {
+    try {
+        let result = callerScope.structure.undefinedData
+        if (params.length() === 0) throw 'needs filename to read'
+        const param1 = params.at(0)
+        if (param1 === undefined) throw 'filename is undefined'
+        const pathname = param1.variable.getString()
+        if (pathname === undefined) throw 'pathname is undefined'
+        const buffer = fs.readFileSync(pathname)
+        const bufferData = new BufferData(callerScope.structure.bufferDataType)
+        bufferData.buffer = buffer
+        result = bufferData
+
+        return result
+    }
+    catch (err) {
+        throw `read_file() error : ${err}`
+    }
+}
+
 /**
  * 
  */

package/src/index.ts

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

package/test/t37.xml

@@ -2,12 +2,17 @@
 <module>
     <object name="list">
         <object>
+            <number name="Id">1</number>
             <string name="Nom">"CHANE"</string>
-            <string name="Prénom">"Phil"</string>
+            <string name="Prenom">"Phil"</string>
+            <number name="Salaire">15250.34</number>
+            <string name="Commentaire">"Hello"</string>
         </object>
         <object>
+            <number name="Id">2</number>
             <string name="Nom">"LAU"</string>
-            <string name="Prénom">"érika"</string>
+            <string name="Prenom">"érika"</string>
+            <number name="Salaire"></number>
         </object>        
     </object>
 
@@ -16,4 +21,16 @@
         <buffer name="content">xlsx(list)</buffer>
     </write_file>
 
+
+    <buffer name="bExcel">read_file("t37.xlsx")</buffer>
+    <type name="columns">
+        <string name="Nom"/>
+        <string name="Prenom"/>
+        <number name="Salaire"/>
+    </type>
+
+    <object name="result">parsexlsx(bExcel, columns)</object>
+
+    <print>format("result = {0}", result)</print>
+
 </module>