@kogeet/scapin-core-agent 0.1.6 → 0.1.8

package/bin/core/context.d.ts

@@ -1,17 +1,16 @@
-import type { RunParamModel } from '../models/run.model.js';
-import { type varType } from '../models/parameter.model.js';
+import type { varType } from "../models/parameter.model.js";
 /**
  * La classe **Context** stocke les variables utilisées lors du test
  */
 export declare class Context {
-    idxStep: number;
     private variables;
     getVariable(varname: string): varType;
     setVariable(varname: string, value: varType): void;
-    loadVariable(params: RunParamModel[]): void;
-    valorize(param: RunParamModel): void;
     dump(): [string, varType][];
-    resetVariables(): void;
+    resetVariables(rVars?: {
+        name: string;
+        value: varType;
+    }[]): void;
 }
 export declare const context: Context;
 //# sourceMappingURL=context.d.ts.map

package/bin/core/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAgB,KAAK,OAAO,EAAC,MAAM,8BAA8B,CAAA;AAExE;;GAEG;AACH,qBAAa,OAAO;IACX,OAAO,EAAE,MAAM,CAAM;IAE5B,OAAO,CAAC,SAAS,CAA6B;IAEvC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAM3C,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE;IAgBpC,QAAQ,CAAC,KAAK,EAAE,aAAa;IAiB7B,IAAI;IAIJ,cAAc;CAGtB;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAE1D;;GAEG;AACH,qBAAa,OAAO;IAElB,OAAO,CAAC,SAAS,CAA6B;IAEvC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAM3C,IAAI;IAIJ,cAAc,CAAC,KAAK,GAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAO;CAMrE;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}

package/bin/core/context.js

@@ -1,9 +1,7 @@
-import { enumParamType } from '../models/parameter.model.js';
 /**
  * La classe **Context** stocke les variables utilisées lors du test
  */
 export class Context {
-    idxStep = -1;
     variables = new Map();
     getVariable(varname) {
         return this.variables.get(varname);
@@ -13,42 +11,14 @@ export class Context {
             this.variables.set(varname, value);
         }
     }
-    loadVariable(params) {
-        const regex = /\$\w+/g;
-        params.forEach((p) => {
-            if (p && p.value && typeof p.value === 'string') {
-                const found = p.value.match(regex);
-                if (found) {
-                    found.forEach((name) => {
-                        if (!this.variables.has(name)) {
-                            this.variables.set(name, undefined);
-                        }
-                    });
-                }
-            }
-        });
-    }
-    valorize(param) {
-        // console.log('Valorize input :', param)
-        const quot = param.type === enumParamType.textdata || param.type === enumParamType.options ? '"' : '';
-        if (param.type !== enumParamType.receipt && param.value && typeof param.value === 'string') {
-            const found = param.value.match(/\$\w+/g);
-            if (found) {
-                found.forEach((vname) => {
-                    if (this.variables.has(vname)) {
-                        const vvalue = this.variables.get(vname);
-                        param.value = param.value.replace(vname, quot + vvalue + quot);
-                    }
-                });
-            }
-        }
-        // console.log('Valorize output :', param)
-    }
     dump() {
         return [...this.variables.entries()];
     }
-    resetVariables() {
+    resetVariables(rVars = []) {
         this.variables.clear();
+        rVars.forEach((v) => {
+            this.setVariable(v.name, v.value);
+        });
     }
 }
 export const context = new Context();

package/bin/core/runsteps.d.ts

@@ -1,9 +1,13 @@
-import type { RunDataStepModel } from '../models/run.model.js';
+import type { RunDataStepModel, Variable } from '../models/run.model.js';
 export declare class RunSteps {
-    private runstep;
+    private runData;
+    private runStep;
     private stepCtx;
     stop: boolean;
-    run(data: RunDataStepModel[] | RunDataStepModel | undefined): Promise<void>;
+    constructor(rData: RunDataStepModel[], rVars: Variable[]);
+    run(pos: number, end: number): Promise<void>;
+    size(): number;
+    close(): void;
     private runAStep;
 }
 //# sourceMappingURL=runsteps.d.ts.map

package/bin/core/runsteps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runsteps.d.ts","sourceRoot":"","sources":["../../src/core/runsteps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAA;AAM5D,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,OAAO,CAA2B;IACnC,IAAI,EAAE,OAAO,CAAQ;IAEf,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,SAAS;YAoB1D,QAAQ;CAwBvB"}
+{"version":3,"file":"runsteps.d.ts","sourceRoot":"","sources":["../../src/core/runsteps.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAA;AAEtE,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,OAAO,CAA2B;IACnC,IAAI,EAAE,OAAO,CAAQ;gBAET,KAAK,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;IAKlD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAkBlC,IAAI;IAEJ,KAAK;YAKE,QAAQ;CAwBvB"}

package/bin/core/runsteps.js

@@ -1,35 +1,44 @@
-import RunStep from './runstep.js';
-import StepContext from './step.context.js';
 import wSocketIo from './wsocket.io.js';
 import { context, report } from "../index.js";
+import StepContext from './step.context.js';
+import RunStep from './runstep.js';
 export class RunSteps {
-    runstep;
+    runData;
+    runStep = new RunStep();
     stepCtx = null;
     stop = false;
-    async run(data) {
-        this.runstep = new RunStep();
-        if (data) {
-            const rundata = !Array.isArray(data) ? [data] : data;
-            context.resetVariables();
-            for (const step of rundata) {
-                await this.runAStep(step);
-                if (this.stop) {
-                    break;
+    constructor(rData, rVars) {
+        this.runData = rData;
+        context.resetVariables(rVars);
+    }
+    async run(pos, end) {
+        if (this.runData.length != 0) {
+            for (let i = pos; i < end; i++) {
+                if (i < this.runData.length) {
+                    const step = this.runData[i];
+                    await this.runAStep(step);
+                    if (this.stop) {
+                        break;
+                    }
                 }
             }
-            wSocketIo.end();
         }
         else {
             report.error('No steps data found');
             wSocketIo.end();
         }
     }
+    size() { return this.runData.length; }
+    close() {
+        this.runData = [];
+        context.resetVariables();
+    }
     async runAStep(step) {
         let stepResult;
         report.stepStart(step.pos);
         try {
             this.stepCtx = new StepContext(step);
-            stepResult = await this.runstep.run(this.stepCtx, step.lib, step.fn);
+            stepResult = await this.runStep.run(this.stepCtx, step.lib, step.fn);
         }
         catch (e) {
             const errMsg = e.message;

package/bin/core/step.context.d.ts

@@ -1,5 +1,5 @@
-import type { RunDataStepModel, RunParamModel } from '../models/run.model.js';
 import { type varType } from '../models/parameter.model.js';
+import type { RunDataStepModel, RunParamModel } from '../models/run.model.js';
 /**
  * La classe **StepContext** gère les paramètres.
  *

package/bin/core/step.context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step.context.d.ts","sourceRoot":"","sources":["../../src/core/step.context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAA;AAC3E,OAAO,EAAgB,KAAK,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAIzE;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IACvB,KAAK,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,SAAgB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;gBAE1B,IAAI,EAAE,gBAAgB;IAa3B,YAAY;IAIZ,aAAa;IAIb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAmB,GAAG,OAAO;IAI3D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,GAAC,SAAqB,GAAG,MAAM;IAIzE,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAmB,GAAG,OAAO;IAInE,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,WAAW;CAiCpB"}
+{"version":3,"file":"step.context.d.ts","sourceRoot":"","sources":["../../src/core/step.context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAA;AAE3E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IACvB,KAAK,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,SAAgB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;gBAE1B,IAAI,EAAE,gBAAgB;IAa3B,YAAY;IAIZ,aAAa;IAIb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAmB,GAAG,OAAO;IAI3D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,GAAC,SAAqB,GAAG,MAAM;IAIzE,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAmB,GAAG,OAAO;IAInE,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,WAAW;CA2BpB"}

package/bin/core/step.context.js

@@ -1,6 +1,6 @@
-import { enumParamType } from '../models/parameter.model.js';
-import { JisonSolver } from './jison.parser.js';
+import { parseParam } from "@kogeet/sapi-parser";
 import { context, report } from "../index.js";
+import {} from '../models/parameter.model.js';
 /**
  * La classe **StepContext** gère les paramètres.
  *
@@ -19,7 +19,7 @@ export default class StepContext {
         this.istoy = step.istoy;
         this.toolid = step.toolid ? step.toolid : null;
         // Chargement si nécessaire des variables présentes dans les paramètres
-        context.loadVariable(this.params);
+        // context.loadVariable(this.params)
         // Résolution des expressions
         this.solveParams();
     }
@@ -43,30 +43,24 @@ export default class StepContext {
         return par && typeof par.value !== 'undefined' ? par.value : defaut;
     }
     solveParams() {
+        const ctxVars = context.dump().map(v => {
+            return { name: v[0], value: v[1] };
+        });
+        // console.log('variables: ', [...ctxVars.map<string>(v => `${v.name}=${v.value}`)])
         this.params.map((param) => {
-            context.valorize(param);
-            if (param.value && param.type && param.options) {
-                const solver = JisonSolver.builder(param.type, param.options);
-                if (solver) {
-                    const strSolveVal = solver.exec(param.value);
-                    if (strSolveVal) {
-                        switch (param.type) {
-                            case enumParamType.booldata:
-                                param.value = strSolveVal.toLowerCase() === 'true';
-                                break;
-                            case enumParamType.numbdata:
-                                param.value = parseFloat(strSolveVal);
-                                break;
-                            case enumParamType.datetime:
-                                param.value = Date.parse(strSolveVal);
-                                break;
-                            default:
-                                param.value = strSolveVal;
-                        }
-                    }
-                    else {
-                        param.value = null;
-                    }
+            // console.log('Parameter ', {...param})
+            if (param.value[0] === "=" && param.type) {
+                let input = param.value;
+                if (input[0] === '=')
+                    input = input.slice(1);
+                const result = parseParam(input, param.type, ctxVars, param.options);
+                if (result.isValid) {
+                    const value = result.resolvedValue || '';
+                    console.log(`Solve ${param.value} => ${value}`);
+                    param.value = value;
+                }
+                else if (result.error && result.error.length > 0) {
+                    report.error(`"${param.value}" parse error: ${result.error}`);
                 }
                 else {
                     report.error(`Impossible to solve expression : ${param.value}`);

package/bin/core/wsocket.io.d.ts

@@ -1,7 +1,7 @@
 import { Socket } from "socket.io-client";
 declare class WsocketIo {
     ioClient: Socket | null;
-    private runsteps;
+    private runSteps;
     private connected;
     private termId;
     start(): void;
@@ -11,6 +11,12 @@ declare class WsocketIo {
      */
     end(): void;
     private onError;
+    /** Réception des données d'exécution en mode Debug **/
+    private onDebugData;
+    /** Ordre d'exécution en mode Debug**/
+    private onDebugRun;
+    private onDebugStop;
+    /** Ordre d'exécution en mode Job **/
     private onRundata;
     private onStatus;
     private onPing;

package/bin/core/wsocket.io.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsocket.io.d.ts","sourceRoot":"","sources":["../../src/core/wsocket.io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAW5C,cAAM,SAAS;IACN,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAEpB,KAAK;IAgDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IAQV,OAAO,CAAC,OAAO,CAUd;IAED,OAAO,CAAC,SAAS,CAQhB;IAED,OAAO,CAAC,QAAQ,CAIf;IAED,OAAO,CAAC,MAAM,CAGb;IAED,OAAO,CAAC,SAAS,CAOhB;CAEF;AAED,QAAA,MAAM,SAAS,WAAkB,CAAA;AACjC,eAAe,SAAS,CAAA"}
+{"version":3,"file":"wsocket.io.d.ts","sourceRoot":"","sources":["../../src/core/wsocket.io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAW5C,cAAM,SAAS;IACN,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAEpB,KAAK;IAkDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IASV,OAAO,CAAC,OAAO,CAUd;IAED,uDAAuD;IACvD,OAAO,CAAC,WAAW,CAGlB;IAED,sCAAsC;IACtC,OAAO,CAAC,UAAU,CAYjB;IAED,OAAO,CAAC,WAAW,CAGlB;IAED,qCAAqC;IACrC,OAAO,CAAC,SAAS,CAGhB;IAED,OAAO,CAAC,QAAQ,CAIf;IAED,OAAO,CAAC,MAAM,CAGb;IAED,OAAO,CAAC,SAAS,CAOhB;CAEF;AAED,QAAA,MAAM,SAAS,WAAkB,CAAA;AACjC,eAAe,SAAS,CAAA"}

package/bin/core/wsocket.io.js

@@ -1,11 +1,11 @@
 import { io, Socket } from "socket.io-client";
-import { RunSteps } from './runsteps.js';
 import { report } from "../index.js";
+import { RunSteps } from './runsteps.js';
 const url = process.env.ScapinServerURL || 'https://scapin.loicg.com';
 const scapinAgentId = process.env.ScapinAgentId;
 class WsocketIo {
     ioClient = null;
-    runsteps = null;
+    runSteps = null;
     connected = true;
     termId = '';
     start() {
@@ -37,11 +37,13 @@ class WsocketIo {
             console.log(`Terminal ${scapinAgentId} is now connected to automation server!`);
         }));
         this.ioClient.on('connect_error', this.onError);
-        this.ioClient.on('data', this.onRundata);
-        this.ioClient.on('rundata', this.onRundata);
+        this.ioClient.on('data', this.onDebugData);
+        this.ioClient.on('run', this.onDebugRun);
+        this.ioClient.on('stop-debugger', this.onDebugStop);
+        this.ioClient.on('run-data', this.onRundata);
         this.ioClient.on('status', this.onStatus);
         this.ioClient.on('status-ping', this.onPing);
-        this.ioClient.on('stoprun', this.onStopRun);
+        this.ioClient.on('stop-run', this.onStopRun);
         // this.ioClient.on('reconnect_attempt', (n: number) => { console.log(`${n} tentative de reconnexion`)})
         this.ioClient.on('reconnect', (n) => {
             console.log(`${n} reconnexion réussies`);
@@ -62,11 +64,12 @@ class WsocketIo {
      * Fin d'exécution d'un run
      */
     end() {
+        this.runSteps?.close();
+        this.runSteps = null;
+        report.clearStepLog();
         if (this.ioClient) {
             this.ioClient.emit('end');
         }
-        this.runsteps = null;
-        report.clearStepLog();
     }
     onError = (err) => {
         const msg = err.description ? err.description.message : '';
@@ -80,19 +83,39 @@ class WsocketIo {
             }
         }
     };
-    onRundata = async (stepsdata) => {
-        this.runsteps = new RunSteps();
-        try {
-            await this.runsteps.run(stepsdata);
+    /** Réception des données d'exécution en mode Debug **/
+    onDebugData = (stepsData, runVar) => {
+        console.log(`Data of the run are: ${stepsData?.length || 0} steps and ${runVar?.length || 0} variables`);
+        this.runSteps = stepsData && runVar ? new RunSteps(stepsData, runVar) : null;
+    };
+    /** Ordre d'exécution en mode Debug**/
+    onDebugRun = async (pos, end) => {
+        console.log(`Running in Debug mode from ${pos} to ${end}`);
+        if (this.runSteps && typeof pos === 'number' && typeof end === 'number') {
+            try {
+                await this.runSteps.run(pos, end);
+            }
+            catch (e) {
+                console.log('Unexpected error : ' + e.message);
+                wSocketIo.end();
+            }
         }
-        catch (e) {
-            console.log('Unexpected error : ' + e.message);
-            wSocketIo.end();
+        else {
+            console.log("Invalid executive data");
         }
     };
+    onDebugStop = () => {
+        console.log("Arrêt du mode debug");
+        wSocketIo.end();
+    };
+    /** Ordre d'exécution en mode Job **/
+    onRundata = async (stepsData, runVars) => {
+        this.onDebugData(stepsData, runVars);
+        await this.onDebugRun(0, this.runSteps?.size() || 0);
+    };
     onStatus = () => {
         if (this.ioClient) {
-            this.ioClient.emit('status', this.runsteps ? 'busy' : 'available');
+            this.ioClient.emit('status', this.runSteps ? 'busy' : 'available');
         }
     };
     onPing = (ack) => {
@@ -101,10 +124,10 @@ class WsocketIo {
     };
     onStopRun = () => {
         console.log('onStopRun');
-        if (this.runsteps) {
-            this.runsteps.stop = true;
+        if (this.runSteps) {
+            this.runSteps.stop = true;
         }
-        this.runsteps = null;
+        this.runSteps = null;
         report.clearStepLog();
     };
 }

package/bin/models/run.model.d.ts

@@ -54,4 +54,8 @@ export declare const logLevel: Readonly<{
     error: 2;
     toString(n: number | undefined): "error" | "" | "info" | "warning";
 }>;
+export interface Variable {
+    name: string;
+    value: string;
+}
 //# sourceMappingURL=run.model.d.ts.map

package/bin/models/run.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.model.d.ts","sourceRoot":"","sources":["../../src/models/run.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,KAAK,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAA;IACnB,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACxB,MAAM,EAAE,aAAa,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,aAAa,EAAE,CAAC;IAG5B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,eAAO,MAAM,UAAU;;;;gBAIT,MAAM,GAAG,SAAS;EAQ9B,CAAA;AAEF,eAAO,MAAM,QAAQ;;;;gBAIP,MAAM,GAAG,SAAS;EAQ9B,CAAA"}
+{"version":3,"file":"run.model.d.ts","sourceRoot":"","sources":["../../src/models/run.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,KAAK,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAA;IACnB,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACxB,MAAM,EAAE,aAAa,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,aAAa,EAAE,CAAC;IAG5B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,eAAO,MAAM,UAAU;;;;gBAIT,MAAM,GAAG,SAAS;EAW9B,CAAA;AAEF,eAAO,MAAM,QAAQ;;;;gBAIP,MAAM,GAAG,SAAS;EAW9B,CAAA;AAEF,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAA;CACd"}

package/bin/models/run.model.js

@@ -5,9 +5,12 @@ export const stepStatus = Object.freeze({
     fail: 2,
     toString(n) {
         switch (n) {
-            case 0: return 'cancel';
-            case 1: return 'pass';
-            case 2: return 'fail';
+            case 0:
+                return 'cancel';
+            case 1:
+                return 'pass';
+            case 2:
+                return 'fail';
         }
         return '';
     },
@@ -18,9 +21,12 @@ export const logLevel = Object.freeze({
     error: 2,
     toString(n) {
         switch (n) {
-            case 0: return 'info';
-            case 1: return 'warning';
-            case 2: return 'error';
+            case 0:
+                return 'info';
+            case 1:
+                return 'warning';
+            case 2:
+                return 'error';
         }
         return '';
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kogeet/scapin-core-agent",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Scapin Core Agent",
   "author": "Loïc Griveau",
   "license": "MIT",
@@ -17,15 +17,15 @@
     "np": "np --no-tests --message=core-agent-%s"
   },
   "devDependencies": {
-    "@types/node": "^20.8.8",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.51.0",
-    "typescript": "^5.2.2"
+    "@types/node": "^25.3.3",
+    "@typescript-eslint/eslint-plugin": "^8.56.1",
+    "@typescript-eslint/parser": "^8.56.1",
+    "eslint": "^9.39.3",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "jison": "^0.4.18",
-    "socket.io-client": "^4.7.2"
+    "@kogeet/sapi-parser": "^1.0.4",
+    "socket.io-client": "^4.8.3"
   },
   "type": "module"
 }

package/bin/core/jison.parser.d.ts

@@ -1,16 +0,0 @@
-import { enumParamType } from '../models/parameter.model.js';
-export declare class JisonParser {
-    error: string | null;
-    result: never | null;
-    private jparser;
-    constructor(grammar: unknown);
-    exec(exp: string): boolean | string;
-    static builder(type: enumParamType, options: string[]): JisonParser | null;
-}
-export declare class JisonSolver {
-    private jparser;
-    constructor(grammar: unknown);
-    exec(exp: string): string | null;
-    static builder(type: enumParamType, options: string[]): JisonSolver | null;
-}
-//# sourceMappingURL=jison.parser.d.ts.map

package/bin/core/jison.parser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"jison.parser.d.ts","sourceRoot":"","sources":["../../src/core/jison.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAU3D,qBAAa,WAAW;IACf,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5B,MAAM,EAAE,KAAK,GAAC,IAAI,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAoC;gBAGhC,OAAO,EAAE,OAAO;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM;WAiB5B,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE;CAS7D;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAA8C;gBAE1C,OAAO,EAAE,OAAO;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM;WAaT,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE;CAQ7D"}

package/bin/core/jison.parser.js

@@ -1,82 +0,0 @@
-import { enumParamType } from '../models/parameter.model.js';
-import { variableGrammar } from '../jison/variable.grammar.js';
-import { logicalGrammar } from '../jison/logical.grammar.js';
-import { stringGrammar } from '../jison/string.grammar.js';
-import { calcGrammar } from '../jison/calc.grammar.js';
-import { datetimeGrammar } from '../jison/datetime.grammar.js';
-import { optionGrammar } from '../jison/option.grammar.js';
-import pkg from "jison";
-const { Parser } = pkg;
-export class JisonParser {
-    error = null;
-    result = null;
-    jparser;
-    constructor(grammar) {
-        this.jparser = new Parser(grammar);
-    }
-    exec(exp) {
-        try {
-            this.jparser.parse(exp);
-            return true;
-        }
-        catch (e) {
-            const m = e.message.split('\n');
-            if (m.length >= 2 && m[2].match(/^-*\^$/)) {
-                const pos = m[2].length;
-                return pos > exp.length
-                    ? 'Expression incomplete'
-                    : `Syntax error near character '${exp.charAt(pos - 1)}' at position ${pos}`;
-            }
-            else {
-                return e.message;
-            }
-        }
-    }
-    static builder(type, options) {
-        const grammar = typeGrammar(type, false, options);
-        try {
-            return new JisonParser(grammar);
-        }
-        catch (e) {
-            return null;
-        }
-    }
-}
-export class JisonSolver {
-    jparser;
-    constructor(grammar) {
-        this.jparser = new Parser(grammar);
-    }
-    exec(exp) {
-        try {
-            const ret = this.jparser.parse(exp);
-            console.log(`Solve expression '${exp}' :`, ret);
-            return ret ? ret : null;
-        }
-        catch (e) {
-            const msg = e.message;
-            console.log(`Solve erreur expression '${exp}' :`, msg);
-            const errs = msg.split('\n');
-            throw errs.length > 1 ? errs[1] : errs[0];
-        }
-    }
-    static builder(type, options) {
-        const grammar = typeGrammar(type, true, options);
-        try {
-            return new JisonSolver(grammar);
-        }
-        catch (e) {
-            return null;
-        }
-    }
-}
-function typeGrammar(type, solve = false, options = []) {
-    switch (type) {
-        case enumParamType.receipt: return variableGrammar;
-        case enumParamType.booldata: return logicalGrammar(solve);
-        case enumParamType.textdata: return stringGrammar(solve);
-        case enumParamType.numbdata: return calcGrammar(solve);
-        case enumParamType.datetime: return datetimeGrammar(solve);
-        case enumParamType.options: return optionGrammar(solve, options);
-    }
-}

package/bin/jison/calc.grammar.d.ts

@@ -1,20 +0,0 @@
-export declare function calcGrammar(solve?: boolean): {
-    lex: {
-        rules: string[][];
-    };
-    operators: string[][];
-    bnf: {
-        expressions: string[][];
-        e: (string | {
-            prec: string;
-        })[][];
-    };
-};
-export declare const xxxGrammar: {
-    lex: {
-        rules: string[][];
-    };
-    operators: never[];
-    bnf: {};
-};
-//# sourceMappingURL=calc.grammar.d.ts.map

package/bin/jison/calc.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calc.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/calc.grammar.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,KAAK,GAAE,OAAe;;;;;;;;;;;EAyDjD;AAGC,eAAO,MAAM,UAAU;;;;;;CAStB,CAAC"}

package/bin/jison/calc.grammar.js

@@ -1,66 +0,0 @@
-/* tslint:disable:quotemark trailing-comma */
-export function calcGrammar(solve = false) {
-    const varValue = solve ? 'return null' : '$$ = 0';
-    return {
-        lex: {
-            rules: [
-                // Saute les espaces
-                ['\\s+', '/* skip whitespace */'],
-                ['[0-9]+(?:\\.[0-9]+)?\\b', 'return `NUMBER`'],
-                ['\\$\\w+', 'return `VARIABLE`'],
-                ['\\*', 'return `*`'],
-                ['\\/', 'return `/`'],
-                ['-', 'return `-`'],
-                ['\\+', 'return `+`'],
-                ['\\^', 'return `^`'],
-                ['!', 'return `!`'],
-                ['%', 'return `%`'],
-                ['\\(', 'return `(`'],
-                ['\\)', 'return `)`'],
-                ['PI\\b', 'return `PI`'],
-                ['E\\b', 'return `E`'],
-                ['$', 'return `EOF`'],
-                ['=', 'return `BEGEXP`']
-            ]
-        },
-        operators: [
-            ['left', '+', '-'],
-            ['left', '*', '/'],
-            ['left', '^'],
-            ['right', '!'],
-            ['right', '%'],
-            ['left', 'UMINUS']
-        ],
-        bnf: {
-            expressions: [['BEGEXP e EOF', 'return $2'], ['NUMBER EOF', 'return $1']],
-            e: [
-                ['e + e', '$$ = $1+$3'],
-                ['e - e', '$$ = $1-$3'],
-                ['e * e', '$$ = $1*$3'],
-                ['e / e', '$$ = $1/$3'],
-                ['e ^ e', '$$ = Math.pow($1, $3)'],
-                ['e !', '$$ = (function(n) {if(n==0) return 1; return arguments.callee(n-1) * n})($1)'],
-                ['e - e %', '$$ = $e1-($e1*($e2/100))'],
-                ['e + e %', '$$ = $e1+($e1*($e2/100))'],
-                ['e * e %', '$$ = $e1*($e2/100)'],
-                ['( e % )', '$$ = $2/100'],
-                ['- e', '$$ = -$2', { prec: 'UMINUS' }],
-                ['( e )', '$$ = $2'],
-                ['NUMBER', '$$ = Number(yytext)'],
-                ['VARIABLE', varValue],
-                ['E', '$$ = Math.E'],
-                ['PI', '$$ = Math.PI']
-            ]
-        }
-    };
-}
-export const xxxGrammar = {
-    lex: {
-        rules: [
-            // Saute les espaces
-            ['\\s+', '/* skip whitespace */'],
-        ]
-    },
-    operators: [],
-    bnf: {}
-};

package/bin/jison/datetime.grammar.d.ts

@@ -1,11 +0,0 @@
-export declare function datetimeGrammar(solve: boolean): {
-    lex: {
-        rules: string[][];
-    };
-    operators: never[];
-    bnf: {
-        expressions: string[][];
-        e: string[][];
-    };
-};
-//# sourceMappingURL=datetime.grammar.d.ts.map

package/bin/jison/datetime.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"datetime.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/datetime.grammar.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO;;;;;;;;;EA2C7C"}

package/bin/jison/datetime.grammar.js

@@ -1,42 +0,0 @@
-export function datetimeGrammar(solve) {
-    const varValue = solve ? 'return null' : '$$ = ``';
-    return {
-        lex: {
-            rules: [
-                ['\\s+', '/* skip whitespace */'],
-                ['\\$\\w+', 'return `VARIABLE`'],
-                ['=', 'return `BEGEXP`'],
-                ['"', 'return `QUOT`'],
-                ['\/', 'return `/`'],
-                ['(0?[1-9]|1[012])', 'return `MM`'],
-                ['(0?[1-9]|[12][0-9]|3[01])', 'return `DD`'],
-                ['\\d\{4\}', 'return `YYYY`'],
-                ['NOW|now', 'return `NOW`'],
-                // ['0?[0-9]|[1][0-9]|2[01234]', 'return `HH`'],
-                // ['0?[0-9]|[12345][0-9]', 'return `0-59`'],
-                // ['\-', 'return `-`'],
-                // ['[12]\\d\\d\\d\\-(0?[1-9]|1[012])\\-(0?[1-9]|[12][0-9]|3[01])', 'return USDATE'],
-                // ['[1-9]+[Dd]', 'return `ADD`'],
-                // ['\+', 'return `+`'],
-                ['$', 'return `EOF`']
-            ]
-        },
-        operators: [],
-        bnf: {
-            expressions: [['BEGEXP e EOF', 'return $2']],
-            e: [
-                ['DD / e', '$$ = $1'],
-                ['e / YYYY', '$$ = $3'],
-                ['/ MM /', '$$ = $2'],
-                // ['YYYY - MM - DD', '$$ = new Date($e1, $e2, $e3)'],
-                // ['DD / MM / YYYY', '$$ = new Date($e3, $e2, $e1)'],
-                // ['HH : 0-59 : 0-59', '$$ = new Date(0, 0, 0, $e1, $e2, $e3)'],
-                // ['QUOT MM QUOT', '$$ = 0'],
-                ['NOW', '$$ = Date.now()'],
-                // ['e + ADD', '$$ = ``'],
-                // ['e + ADD', '$$ = {const ret = new Date($e1); return ret.setDate(ret.getDate() + parseInt($e2))}'],
-                ['VARIABLE', varValue]
-            ]
-        }
-    };
-}

package/bin/jison/logical.grammar.d.ts

@@ -1,11 +0,0 @@
-export declare function logicalGrammar(solve: boolean): {
-    lex: {
-        rules: string[][];
-    };
-    operators: string[][];
-    bnf: {
-        expressions: string[][];
-        e: string[][];
-    };
-};
-//# sourceMappingURL=logical.grammar.d.ts.map

package/bin/jison/logical.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logical.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/logical.grammar.ts"],"names":[],"mappings":"AACA,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO;;;;;;;;;EAsC5C"}

package/bin/jison/logical.grammar.js

@@ -1,39 +0,0 @@
-export function logicalGrammar(solve) {
-    const varValue = solve ? 'return null' : '$$ = 0';
-    return {
-        lex: {
-            // startConditions: {
-            //   expression: 'return e',
-            //   value: 'return v'
-            // },
-            rules: [
-                ['\\s+', '/* skip whitespace */'],
-                ['[0-9]+(?:\\.[0-9]+)?\\b', 'return `NUMBER`'],
-                ['\\$\\w+', 'return `VARIABLE`'],
-                ['TRUE|true|FALSE|false', 'return `BOOLEAN`'],
-                ['<=', 'return `INFEQ`'],
-                ['>=', 'return `SUPEQ`'],
-                ['<', 'return `INF`'],
-                ['>', 'return `SUP`'],
-                ['$', 'return `EOF`'],
-                ['=', 'return `BEGEXP`']
-            ]
-        },
-        operators: [
-            ['left', 'INF', 'SUP', 'INFEQ', 'SUPEQ'],
-            ['right', 'BEGEXP']
-        ],
-        bnf: {
-            expressions: [['BEGEXP e EOF', 'return $2'], ['BOOLEAN EOF', 'return $1']],
-            e: [
-                ['NUMBER', '$$ = Number(yytext)'],
-                ['VARIABLE', varValue],
-                ['BOOLEAN', '$$ = yytext === `TRUE` || yytext === `true`'],
-                ['e INF e', '$$ = $1<$3'],
-                ['e SUP e', '$$ = $1 > $3'],
-                ['e SUPEQ e', '$$ = $1 >= $3'],
-                ['e INFEQ e', '$$ = $1 <= $3'],
-            ]
-        }
-    };
-}

package/bin/jison/option.grammar.d.ts

@@ -1,11 +0,0 @@
-export declare function optionGrammar(solve: boolean, options: string[]): {
-    lex: {
-        rules: string[][];
-    };
-    operators: never[];
-    bnf: {
-        expressions: string[][];
-        e: string[][];
-    };
-};
-//# sourceMappingURL=option.grammar.d.ts.map

package/bin/jison/option.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"option.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/option.grammar.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;;;;;;EAyB9D"}

package/bin/jison/option.grammar.js

@@ -1,24 +0,0 @@
-export function optionGrammar(solve, options) {
-    const varValue = solve ? 'return null' : '$$ = ``';
-    const optValue = options.join('|');
-    return {
-        lex: {
-            rules: [
-                ['\\s+', '/* skip whitespace */'],
-                ['\\$\\w+', 'return `VARIABLE`'],
-                ['"', 'return `QUOT`'],
-                [optValue, 'return `OPTION`'],
-                ['$', 'return `EOF`'],
-                ['=', 'return `BEGEXP`']
-            ]
-        },
-        operators: [],
-        bnf: {
-            expressions: [['BEGEXP e EOF', 'return $2'], ['OPTION EOF', 'return $1']],
-            e: [
-                ['QUOT OPTION QUOT', '$$ = $2'],
-                ['VARIABLE', varValue]
-            ]
-        }
-    };
-}

package/bin/jison/string.grammar.d.ts

@@ -1,11 +0,0 @@
-export declare function stringGrammar(solve: boolean): {
-    lex: {
-        rules: string[][];
-    };
-    operators: string[][];
-    bnf: {
-        expressions: string[][];
-        e: string[][];
-    };
-};
-//# sourceMappingURL=string.grammar.d.ts.map

package/bin/jison/string.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"string.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/string.grammar.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO;;;;;;;;;EA+B3C"}

package/bin/jison/string.grammar.js

@@ -1,31 +0,0 @@
-/* tslint:disable:trailing-comma */
-export function stringGrammar(solve) {
-    const varVariable = solve ? 'return null' : '$$ = ``';
-    return {
-        lex: {
-            rules: [
-                // Saute les espaces
-                ['\\s+', '/* skip whitespace */'],
-                ['\\$\\w+', 'return `VARIABLE`'],
-                ['_', 'return `SPACE`'],
-                ['"', 'return `QUOT`'],
-                ['\\&', 'return `&`'],
-                ['=', 'return `BEGEXP`'],
-                ['[^"]+', 'return `STRING`'],
-                ['$', 'return `EOF`'],
-            ]
-        },
-        operators: [
-            ['left', '&']
-        ],
-        bnf: {
-            expressions: [['BEGEXP e EOF', 'return $2'], ['STRING EOF', 'return $1']],
-            e: [
-                ['e & e', '$$ = `${$1}${$3}`'],
-                ['QUOT STRING QUOT', '$$ = $2'],
-                ['SPACE', '$$ = ` `'],
-                ['VARIABLE', varVariable]
-            ]
-        }
-    };
-}

package/bin/jison/variable.grammar.d.ts

@@ -1,10 +0,0 @@
-export declare const variableGrammar: {
-    lex: {
-        rules: string[][];
-    };
-    operators: never[];
-    bnf: {
-        expressions: string[][];
-    };
-};
-//# sourceMappingURL=variable.grammar.d.ts.map

package/bin/jison/variable.grammar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"variable.grammar.d.ts","sourceRoot":"","sources":["../../src/jison/variable.grammar.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,eAAe;;;;;;;;CAa3B,CAAC"}

package/bin/jison/variable.grammar.js

@@ -1,14 +0,0 @@
-export const variableGrammar = {
-    lex: {
-        rules: [
-            // Saute les espaces
-            ['\\s+', '/* skip whitespace */'],
-            ['\\$\\w+', 'return `VARIABLE`'],
-            ['$', 'return `EOF`']
-        ]
-    },
-    operators: [],
-    bnf: {
-        expressions: [['VARIABLE EOF', 'return $1']]
-    }
-};