dhti-cli 0.3.0 → 0.3.1

package/dist/commands/compose.js

@@ -2,18 +2,26 @@ import { Args, Command, Flags } from '@oclif/core';
 import yaml from 'js-yaml';
 import fs from 'node:fs';
 import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 export default class Compose extends Command {
     static args = {
         op: Args.string({ description: 'Operation to perform (add, delete, read or reset)' }),
     };
     static description = 'Generates a docker-compose.yml file from a list of modules';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
-        file: Flags.string({ char: 'f', default: `${os.homedir()}/dhti/docker-compose.yml`, description: 'Full path to the docker compose file to read from. Creates if it does not exist' }),
+        file: Flags.string({
+            char: 'f',
+            default: `${os.homedir()}/dhti/docker-compose.yml`,
+            description: 'Full path to the docker compose file to read from. Creates if it does not exist',
+        }),
         // flag with a value (-n, --name=VALUE)
-        module: Flags.string({ char: 'm', description: 'Modules to add from ( langserve, openmrs, ollama, langfuse, cqlFhir, redis, neo4j and mcpFhir)', multiple: true }),
+        module: Flags.string({
+            char: 'm',
+            description: 'Modules to add from ( langserve, openmrs, ollama, langfuse, cqlFhir, redis, neo4j and mcpFhir)',
+            multiple: true,
+        }),
     };
     static init = () => {
         // Create ${os.homedir()}/dhti if it does not exist
@@ -27,6 +35,10 @@ export default class Compose extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Compose);
+        // Resolve resources directory for both dev (src) and packaged (dist)
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = path.dirname(__filename);
+        const RESOURCES_DIR = path.resolve(__dirname, '../resources');
         // console.log('args', args) //args { op: 'add' }
         // console.log('flags', flags) //flags { module: [ 'default', 'langserve', 'redis' ] }
         const openmrs = ['gateway', 'frontend', 'backend', 'openmrs-db'];
@@ -51,10 +63,10 @@ export default class Compose extends Command {
             ollama,
             openmrs,
             redis,
-            webui
+            webui,
         };
         try {
-            const masterData = yaml.load(fs.readFileSync('src/resources/docker-compose-master.yml', 'utf8'));
+            const masterData = yaml.load(fs.readFileSync(path.join(RESOURCES_DIR, 'docker-compose-master.yml'), 'utf8'));
             let existingData = { services: {}, version: '3.8' };
             if (fs.existsSync(flags.file)) {
                 existingData = yaml.load(fs.readFileSync(flags.file, 'utf8'));

package/dist/commands/conch.js

@@ -2,28 +2,44 @@ import { Args, Command, Flags } from '@oclif/core';
 import { exec } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 export default class Conch extends Command {
     static args = {
         op: Args.string({ description: 'Operation to perform (install, uninstall or dev)' }),
     };
     static description = 'Install or uninstall conchs to create a Docker image';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
-        branch: Flags.string({ char: 'b', default: "develop", description: 'Branch to install from' }),
-        container: Flags.string({ char: 'c', default: "dhti-frontend-1", description: 'Name of the container to copy the conch to while in dev mode' }),
-        dev: Flags.string({ char: 'd', default: "none", description: 'Dev folder to install' }),
-        git: Flags.string({ char: 'g', default: "none", description: 'Github repository to install' }),
-        image: Flags.string({ char: 'i', default: "openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.17", description: 'Base image to use for the conch' }),
+        branch: Flags.string({ char: 'b', default: 'develop', description: 'Branch to install from' }),
+        container: Flags.string({
+            char: 'c',
+            default: 'dhti-frontend-1',
+            description: 'Name of the container to copy the conch to while in dev mode',
+        }),
+        dev: Flags.string({ char: 'd', default: 'none', description: 'Dev folder to install' }),
+        git: Flags.string({ char: 'g', default: 'none', description: 'Github repository to install' }),
+        image: Flags.string({
+            char: 'i',
+            default: 'openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.17',
+            description: 'Base image to use for the conch',
+        }),
         name: Flags.string({ char: 'n', description: 'Name of the elixir' }),
-        repoVersion: Flags.string({ char: 'v', default: "1.0.0", description: 'Version of the conch' }),
-        workdir: Flags.string({ char: 'w', default: `${os.homedir()}/dhti`, description: 'Working directory to install the conch' }),
+        repoVersion: Flags.string({ char: 'v', default: '1.0.0', description: 'Version of the conch' }),
+        workdir: Flags.string({
+            char: 'w',
+            default: `${os.homedir()}/dhti`,
+            description: 'Working directory to install the conch',
+        }),
     };
     async run() {
         const { args, flags } = await this.parse(Conch);
+        // Resolve resources directory for both dev (src) and packaged (dist)
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = path.dirname(__filename);
+        const RESOURCES_DIR = path.resolve(__dirname, '../resources');
         if (!flags.name) {
-            console.log("Please provide a name for the conch");
+            console.log('Please provide a name for the conch');
             this.exit(1);
         }
         // if arg is dev then copy to docker as below
@@ -50,14 +66,14 @@ export default class Conch extends Command {
                 });
             }
             catch (error) {
-                console.log("Error copying conch to container", error);
+                console.log('Error copying conch to container', error);
             }
         }
         // Create a directory to install the elixir
         if (!fs.existsSync(`${flags.workdir}/conch`)) {
             fs.mkdirSync(`${flags.workdir}/conch`);
         }
-        fs.cpSync('src/resources/spa', `${flags.workdir}/conch`, { recursive: true });
+        fs.cpSync(path.join(RESOURCES_DIR, 'spa'), `${flags.workdir}/conch`, { recursive: true });
         // Rewrite files
         const rewrite = () => {
             flags.name = flags.name ?? 'openmrs-esm-genai';
@@ -77,16 +93,19 @@ export default class Conch extends Command {
             fs.writeFileSync(`${flags.workdir}/conch/def/spa-assemble-config.json`, JSON.stringify(spaAssembleConfig, null, 2));
             // Read and process Dockerfile
             let dockerfile = fs.readFileSync(`${flags.workdir}/conch/Dockerfile`, 'utf8');
-            dockerfile = dockerfile.replaceAll('conch', flags.name).replaceAll('version', flags.repoVersion).replaceAll('server-image', flags.image);
+            dockerfile = dockerfile
+                .replaceAll('conch', flags.name)
+                .replaceAll('version', flags.repoVersion)
+                .replaceAll('server-image', flags.image);
             fs.writeFileSync(`${flags.workdir}/conch/Dockerfile`, dockerfile);
             // Read routes.json
             const routes = JSON.parse(fs.readFileSync(`${flags.workdir}/conch/${flags.name}/src/routes.json`, 'utf8'));
             // Add to routes.registry.json
             const registry = JSON.parse(fs.readFileSync(`${flags.workdir}/conch/def/routes.registry.json`, 'utf8'));
             if (args.op === 'install')
-                registry[(flags.name).replace('openmrs-', '@openmrs/')] = routes;
+                registry[flags.name.replace('openmrs-', '@openmrs/')] = routes;
             if (args.op === 'uninstall')
-                delete registry[(flags.name).replace('openmrs-', '@openmrs/')];
+                delete registry[flags.name.replace('openmrs-', '@openmrs/')];
             fs.writeFileSync(`${flags.workdir}/conch/def/routes.registry.json`, JSON.stringify(registry, null, 2));
         };
         if (flags.git !== 'none') {

package/dist/commands/elixir.js

@@ -3,6 +3,7 @@ import { exec } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 export default class Elixir extends Command {
     static args = {
         op: Args.string({ description: 'Operation to perform (install, uninstall or dev)' }),
@@ -34,6 +35,10 @@ export default class Elixir extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Elixir);
+        // Resolve resources directory for both dev (src) and packaged (dist)
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = path.dirname(__filename);
+        const RESOURCES_DIR = path.resolve(__dirname, '../resources');
         if (!flags.name) {
             console.log('Please provide a name for the elixir');
             this.exit(1);
@@ -69,7 +74,7 @@ export default class Elixir extends Command {
         if (!fs.existsSync(`${flags.workdir}/elixir`)) {
             fs.mkdirSync(`${flags.workdir}/elixir`);
         }
-        fs.cpSync('src/resources/genai', `${flags.workdir}/elixir`, { recursive: true });
+        fs.cpSync(path.join(RESOURCES_DIR, 'genai'), `${flags.workdir}/elixir`, { recursive: true });
         // if whl is not none, copy the whl file to thee whl directory
         if (flags.whl !== 'none') {
             if (!fs.existsSync(`${flags.workdir}/elixir/whl/`)) {

package/oclif.manifest.json

@@ -440,5 +440,5 @@
       ]
     }
   },
-  "version": "0.3.0"
+  "version": "0.3.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dhti-cli",
   "description": "DHTI CLI",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "Bell Eapen",
   "bin": {
     "dhti-cli": "bin/run.js"