(feat) O3-3443 Command in the OpenMRS CLI to package up configurations

package.json

@@ -15,9 +15,9 @@
     "ci:publish": "yarn workspaces foreach --all --topological --exclude @openmrs/esm-core npm publish --access public --tag latest",
     "release": "yarn workspaces foreach --all --topological version",
     "build": "turbo run build",
+    "assemble": "openmrs assemble",
     "build:apps": "turbo run build --filter='@openmrs/*-app'",
     "setup": "yarn install && turbo run build",
-    "merge-configs": "openmrs merge-configs",
     "start": "openmrs develop",
     "verify": "turbo run lint test typescript",
     "postinstall": "husky install",

packages/framework/esm-framework/docs/interfaces/WorkspaceContainerProps.md

@@ -48,7 +48,4 @@ ___
 • `Optional` **showSiderailAndBottomNav**: `boolean`
 
 #### Defined in
-
-
-[packages/framework/esm-styleguide/src/workspaces/container/workspace-container.component.tsx:19](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/workspaces/container/workspace-container.component.tsx#L19)
-
+[packages/framework/esm-styleguide/src/workspaces/container/workspace-container.component.tsx:18](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/workspaces/container/workspace-container.component.tsx#L18)

packages/tooling/openmrs/src/cli.ts

@@ -15,7 +15,7 @@
 
 function runCommand<T extends CommandNames>(type: T, args: Parameters<Commands[T]>[0]) {
   const ps = fork(runner, [], { cwd: type === 'runBuild' ? root : process.cwd() })
   console.log(`These are the args received by the runner: ${args}`);
 
   ps.send({
     type,
@@ -290,10 +290,10 @@
         type: 'boolean',
       })
       .option('mode', {
-        choices: ['config', 'survey'],
+        choices: ['config', 'configFile', 'survey'],
         default: 'survey',
         description:
-          'The source of the frontend modules to assemble. `config` uses a configuration file specified via `--config`. `survey` starts an interactive command-line survey.',
+          'The source of the frontend modules to assemble. `config` uses a configuration file specified via `--config`. `configFile packages up configurations from file specified cia `--config-file`. survey` starts an interactive command-line survey.',
         type: 'string',
       }),
   (args) => runCommand('runAssemble', args),
@@ -324,31 +324,6 @@
       ...args,
     }),
 );
-
-yargs.command(
-  'merge-configs',
-  'Merges configuration files from multiple directories into a single output file',
-  (argv) =>
-    argv
-      .option('directoriesPath', {
-        alias: 'd',
-        describe: 'Directories to read config files from',
-        type: 'string',
-        demandOption: true,
-      })
-      .option('outputPath', {
-        alias: 'o',
-        describe: 'Output file path',
-        type: 'string',
-        demandOption: true,
-      })
-      .help()
-      .argv,
-      (args) => runCommand('runMergeConfig', {
-        directoriesPath: args.directoriesPath  as string,
-        outputPath: args.outputPath as string,
-      })
-);
 yargs
   .epilog(
     'The SPA build config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` ' +

packages/tooling/openmrs/src/commands/assemble.ts

@@ -17,6 +17,7 @@
   target: string;
   mode: string;
   config: Array<string>;
+  myConfigs: Array<string>;
   registry?: string;
   hashImportmap: boolean;
   fresh: boolean;
@@ -43,6 +44,7 @@
 async function readConfig(
   mode: string,
   configs: Array<string>,
+  myConfigs: Array<string>,
   fetchOptions: npmRegistryFetch.Options,
 ): Promise<AssembleConfig> {
   switch (mode) {
@@ -101,7 +103,33 @@
         return config;
       });
     }
+    case 'myConfigs':{
+      if (!myConfigs.length) {
+        throw new Error('Please specify config files using the --config-file option.');
+      }
+
+      const results: {
+        myConfigs: Array<AssembleConfig>;
+        errors: Array<Error>;
+      } = {
+        myConfigs: [],
+        errors: [],
+      };
+
+      for (const config of myConfigs) {
+        if (!existsSync(config)) {
+          results.errors.push(new Error(`Could not find the config file "${config}".`));
+          continue;
+        }
+
+        logInfo(`Reading configuration ${config} ...`);
+
+        results.myConfigs.push({
+          ...JSON.parse(await readFile(config, 'utf8')),
+        });
+      }
+    }
     case 'survey': {
       logInfo(`Loading available frontend modules ...`);
 
       const packages = await npmRegistryFetch
@@ -230,7 +258,7 @@
 
 export async function runAssemble(args: AssembleArgs) {
   const npmConf = getNpmRegistryConfiguration(args.registry);
-  const config = await readConfig(args.mode, args.config, npmConf);
+  const config = await readConfig(args.mode, args.config, args.myConfigs, npmConf);
 
   const importmap = {
     imports: {},
@@ -303,5 +331,9 @@
     await writeFile(resolve(args.target, 'spa-assemble-config.json'), JSON.stringify(versionManifest), 'utf8');
   }
 
+  if(args.mode === 'myConfigs'){
+    await writeFile(resolve(args.target, 'My-Merged-configs.json'), JSON.stringify(config), 'utf8');
+  }
+
   logInfo(`Finished assembling frontend distribution`);
 }

packages/tooling/openmrs/src/commands/index.ts

@@ -3,4 +3,3 @@ export * from './build';
 export * from './debug';
 export * from './develop';
 export * from './start';
-export * from './merge-configs';