@cyberismo/data-handler 0.0.8 → 0.0.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cyberismo/data-handler",
   "description": "Command handler for cards and web service",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "author": "sami.merila@cyberismo.com",
   "license": "AGPL-3.0",
   "homepage": "https://github.com/CyberismoCom/cyberismo",
@@ -24,28 +24,30 @@
     "@types/sinon": "^17.0.4",
     "c8": "^10.1.3",
     "pino-pretty": "^13.0.0",
-    "sinon": "^20.0.0"
+    "sinon": "^21.0.0"
   },
   "dependencies": {
     "@asciidoctor/core": "^3.0.4",
     "@viz-js/viz": "^3.12.0",
     "async-mutex": "^0.5.0",
-    "csv-parse": "^5.6.0",
+    "csv-parse": "^6.1.0",
     "directory-schema-validator": "^1.0.17",
     "dompurify": "^3.2.6",
     "email-validator": "^2.0.4",
     "handlebars": "^4.7.8",
-    "isomorphic-git": "^1.30.2",
     "jsdom": "^26.1.0",
     "json-schema": "^0.4.0",
     "jsonschema": "^1.5.0",
     "mime-types": "^3.0.1",
     "pino": "^9.7.0",
     "simple-git": "^3.2.0",
+    "string-pixel-width": "^1.11.0",
     "tslib": "^2.6.2",
+    "vega": "^6.1.2",
+    "vega-lite": "^6.2.0",
     "write-json-file": "^6.0.0",
-    "@cyberismo/node-clingo": "1.0.4",
-    "@cyberismo/assets": "0.0.8"
+    "@cyberismo/assets": "0.0.10",
+    "@cyberismo/node-clingo": "1.1.5"
   },
   "type": "module",
   "files": [

package/src/command-handler.ts

@@ -45,6 +45,7 @@ import { readJsonFile } from './utils/json.js';
 import { resourceName } from './utils/resource-utils.js';
 
 import { type Level } from 'pino';
+import { type Context } from './interfaces/project-interfaces.js';
 
 // Generic options interface
 export interface CardsOptions {
@@ -55,6 +56,14 @@ export interface CardsOptions {
   repeat?: number;
   showUse?: boolean;
   logLevel?: Level;
+  context?: Context;
+  recursive?: boolean;
+  title?: string;
+  name?: string;
+  date?: string;
+  version?: string;
+  revremark?: string;
+  mappingFile?: string;
 }
 
 // Commands that this class supports.
@@ -82,8 +91,8 @@ export enum Cmd {
 // To what format the content can be exported to.
 export enum ExportFormats {
   adoc = 'adoc',
-  html = 'html',
   site = 'site',
+  pdf = 'pdf',
 }
 
 export { CommandManager } from './command-manager.js';
@@ -195,10 +204,10 @@ export class Commands {
             return { statusCode: 400, message: 'File path is missing' };
           }
           await this.generateLogicProgram();
-          return this.runLogicProgram(cardKey);
+          return this.runLogicProgram(cardKey, options.context || 'localApp');
         }
         if (command === 'generate') {
-          return this.generateLogicProgram(cardKey);
+          return this.generateLogicProgram();
         }
       } else if (command === Cmd.create) {
         const [type, ...rest] = args;
@@ -266,7 +275,12 @@ export class Commands {
         await this.commands?.editCmd.editCard(cardKey);
       } else if (command === Cmd.export) {
         const [format, output, cardKey] = args;
-        await this.export(output, format as ExportFormats, cardKey);
+        return await this.export(
+          output,
+          format as ExportFormats,
+          cardKey,
+          options,
+        );
       } else if (command === Cmd.import) {
         const target = args.splice(0, 1)[0];
         if (target === 'module') {
@@ -322,7 +336,11 @@ export class Commands {
         );
       } else if (command === Cmd.report) {
         const [parameters, outputPath] = args;
-        return this.runReport(parameters, outputPath);
+        return this.runReport(
+          parameters,
+          options.context || 'localApp',
+          outputPath,
+        );
       } else if (command === Cmd.start) {
         return this.startApp(options.forceStart);
       } else if (command === Cmd.transition) {
@@ -339,15 +357,61 @@ export class Commands {
           parsedValue = value;
         }
 
+        // Handle mapping file for workflow changes
+        let mappingTable: { stateMapping: Record<string, string> } | undefined;
+        if (
+          options.mappingFile &&
+          operation === 'change' &&
+          key === 'workflow'
+        ) {
+          try {
+            const mappingData = await readJsonFile(
+              resolveTilde(options.mappingFile),
+            );
+            if (
+              mappingData &&
+              typeof mappingData === 'object' &&
+              'stateMapping' in mappingData
+            ) {
+              mappingTable = mappingData as {
+                stateMapping: Record<string, string>;
+              };
+            } else {
+              throw new Error(
+                'Mapping file must contain a "stateMapping" object',
+              );
+            }
+          } catch (error) {
+            throw new Error(
+              `Failed to read mapping file: ${errorFunction(error)}`,
+            );
+          }
+        }
+
+        let parsedNewValue = newValue;
+        if (newValue) {
+          try {
+            parsedNewValue = JSON.parse(newValue);
+          } catch {
+            parsedNewValue = newValue;
+          }
+        }
+
         await this.commands?.updateCmd.updateValue(
           resource,
           operation as UpdateOperations,
           key,
           parsedValue,
-          newValue ? JSON.parse(newValue) : undefined,
+          parsedNewValue,
+          mappingTable,
         );
       } else if (command === Cmd.updateModules) {
-        await this.commands?.importCmd.updateAllModules(credentials);
+        const [module] = args;
+        if (module) {
+          await this.commands?.importCmd.updateModule(module, credentials);
+        } else {
+          await this.commands?.importCmd.updateAllModules(credentials);
+        }
       } else if (command === Cmd.validate) {
         return this.validate();
       } else {
@@ -446,31 +510,37 @@ export class Commands {
     destination: string = 'output',
     format: ExportFormats,
     parentCardKey?: string,
+    pdfOptions?: CardsOptions,
   ): Promise<requestStatus> {
     if (!this.commands) {
       return { statusCode: 500 };
     }
     process.env.EXPORT_FORMAT = format;
     let message = '';
-    if (format === 'adoc') {
+    if (format === 'pdf') {
+      const options = {
+        title: pdfOptions?.title || 'Title',
+        name: pdfOptions?.name || 'Name',
+        version: pdfOptions?.version || '1.0.0',
+        revremark: pdfOptions?.revremark || 'Initial version',
+        cardKey: parentCardKey,
+        date: pdfOptions?.date ? new Date(pdfOptions.date) : new Date(),
+      };
+      message = await this.commands?.exportCmd.exportPdf(destination, options);
+    } else {
       message = await this.commands?.exportCmd.exportToADoc(
         destination,
         parentCardKey,
       );
-    } else if (format === 'html') {
-      message = await this.commands?.exportCmd.exportToHTML(
-        destination,
-        parentCardKey,
-      );
     }
     process.env.EXPORT_FORMAT = '';
     return { statusCode: 200, message: message };
   }
 
   // Generates logic program for a card.
-  private async generateLogicProgram(cardKey?: string): Promise<requestStatus> {
+  private async generateLogicProgram(): Promise<requestStatus> {
     try {
-      await this.commands?.calculateCmd.generate(cardKey);
+      await this.commands?.calculateCmd.generate();
       return { statusCode: 200 };
     } catch (e) {
       return { statusCode: 500, message: errorFunction(e) };
@@ -517,10 +587,14 @@ export class Commands {
   }
 
   // Runs a given logic program along with the query-language
-  private async runLogicProgram(filePath: string): Promise<requestStatus> {
+  private async runLogicProgram(
+    filePath: string,
+    context: Context,
+  ): Promise<requestStatus> {
     try {
       const res = await this.commands?.calculateCmd.runLogicProgram(
         readFileSync(filePath, 'utf-8'),
+        context,
       );
       return {
         statusCode: 200,
@@ -532,7 +606,11 @@ export class Commands {
   }
 
   // Runs a report using Handlebars and the provided parameters.
-  private async runReport(parametersPath: string, outputPath?: string) {
+  private async runReport(
+    parametersPath: string,
+    context: Context,
+    outputPath?: string,
+  ) {
     const parametersFile = await readJsonFile(parametersPath);
 
     // Validate the parameters file.
@@ -565,6 +643,7 @@ export class Commands {
         name,
         parameters.cardKey,
         parameters,
+        context,
         outputPath,
       );
     } catch (e) {

package/src/command-manager.ts

@@ -59,15 +59,15 @@ export class CommandManager {
     this.validateCmd = Validate.getInstance();
 
     this.calculateCmd = new Calculate(this.project);
-    this.showCmd = new Show(this.project, this.calculateCmd);
-    this.createCmd = new Create(this.project, this.calculateCmd);
-    this.editCmd = new Edit(this.project, this.calculateCmd);
-    this.exportCmd = new Export(this.project, this.calculateCmd, this.showCmd);
+    this.showCmd = new Show(this.project);
+    this.createCmd = new Create(this.project);
+    this.editCmd = new Edit(this.project);
+    this.exportCmd = new Export(this.project, this.showCmd);
     this.importCmd = new Import(this.project, this.createCmd);
-    this.moveCmd = new Move(this.project, this.calculateCmd);
-    this.removeCmd = new Remove(this.project, this.calculateCmd);
-    this.renameCmd = new Rename(this.project, this.calculateCmd);
-    this.transitionCmd = new Transition(this.project, this.calculateCmd);
+    this.moveCmd = new Move(this.project);
+    this.removeCmd = new Remove(this.project);
+    this.renameCmd = new Rename(this.project);
+    this.transitionCmd = new Transition(this.project);
     this.updateCmd = new Update(this.project);
     this.pathHandler = new ProjectPaths(path);
   }