CLI: Support multiple tasks #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

ncomerci wants to merge 32 commits into main from cli/support-multiple-tasks

packages/cli/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ @@
         "@types/lodash": "^4.17.15",
         "@types/mocha": "^10.0.1",
         "@types/node": "^22.10.5",
+        "@types/sinon": "^21.0.0",
         "axios-mock-adapter": "^2.1.0",
         "chai": "^4.3.7",
         "eslint-config-mimic": "^0.0.3",
@@ Expand Down @@

packages/cli/src/commands/build.ts

-Original file line number
+Diff line change
@@ -1,7 +1,9 @@
     import { Command, Flags } from '@oclif/core'
-    import Codegen from './codegen'
-    import Compile from './compile'
+    import { build } from '../core'
+    import { createConfirmClean, runTasks } from '../helpers'
+    import MimicConfigHandler, { taskFilterFlags } from '../lib/MimicConfigHandler'
+    import { coreLogger } from '../log'
     export default class Build extends Command {
       static override description = 'Runs code generation and then compiles the task'
@@ Expand All / @@ -20,18 +22,37 @@ export default class Build extends Command { @@
           description: 'remove existing generated types before generating new files',
           default: false,
         }),
+        ...taskFilterFlags,
       }
       public async run(): Promise<void> {
         const { flags } = await this.parse(Build)
-        const { manifest, task, output, types, clean } = flags
-        const codegenArgs: string[] = ['--manifest', manifest, '--output', types]
-        if (clean) codegenArgs.push('--clean')
-        await Codegen.run(codegenArgs)
-        const compileArgs: string[] = ['--task', task, '--manifest', manifest, '--output', output]
-        await Compile.run(compileArgs)
+        const { manifest, task, output, types, clean, include, exclude } = flags
+        const tasks = MimicConfigHandler.getFilteredTasks(this, {
+          defaultTask: {
+            manifest,
+            task: task,
+            output,
+            types,
+          },
+          include,
+          exclude,
+        })
+        await runTasks(this, tasks, async (config) => {
+          await build(
+            {
+              manifestPath: config.manifest,
+              taskPath: config.task,
+              outputDir: config.output,
+              typesDir: config.types,
+              clean,
+              confirmClean: createConfirmClean(this, config.types, coreLogger),
+            },
+            coreLogger
+          )
+          coreLogger.info(`Build complete! Artifacts in ${config.output}/`)
+        })
       }
     }

packages/cli/src/commands/codegen.ts

-Original file line number
+Diff line change
@@ -1,11 +1,9 @@
-    import { confirm } from '@inquirer/prompts'
     import { Command, Flags } from '@oclif/core'
-    import * as fs from 'fs'
-    import { join } from 'path'
-    import { AbisInterfaceGenerator, InputsInterfaceGenerator, ManifestHandler } from '../lib'
-    import log from '../log'
-    import { Manifest } from '../types'
+    import { codegen } from '../core'
+    import { createConfirmClean, runTasks } from '../helpers'
+    import MimicConfigHandler, { taskFilterFlags } from '../lib/MimicConfigHandler'
+    import { coreLogger } from '../log'
     export default class Codegen extends Command {
       static override description = 'Generates typed interfaces for declared inputs and ABIs from your manifest.yaml file'
@@ Expand All / @@ -14,56 +12,39 @@ export default class Codegen extends Command { @@
       static override flags = {
         manifest: Flags.string({ char: 'm', description: 'Specify a custom manifest file path', default: 'manifest.yaml' }),
-        output: Flags.string({ char: 'o', description: 'Ouput directory for generated types', default: './src/types' }),
+        output: Flags.string({ char: 'o', description: 'Output directory for generated types', default: './src/types' }),
         clean: Flags.boolean({
           char: 'c',
           description: 'Remove existing generated types before generating new files',
           default: false,
         }),
+        ...taskFilterFlags,
       }
       public async run(): Promise<void> {
         const { flags } = await this.parse(Codegen)
-        const { manifest: manifestDir, output: outputDir, clean } = flags
-        const manifest = ManifestHandler.load(this, manifestDir)
-        if (clean) {
-          const shouldDelete = await confirm({
-            message: `Are you sure you want to ${log.warnText('delete')} all the contents in ${log.highlightText(outputDir)}. This action is ${log.warnText('irreversible')}`,
-            default: false,
-          })
-          if (!shouldDelete) {
-            console.log('You can remove the --clean flag from your command')
-            console.log('Stopping initialization...')
-            this.exit(0)
-          }
-          log.startAction(`Deleting contents of ${outputDir}`)
-          if (fs.existsSync(outputDir)) fs.rmSync(outputDir, { recursive: true, force: true })
-        }
-        log.startAction('Generating code')
-        if (Object.keys(manifest.inputs).length == 0 && Object.keys(manifest.abis).length == 0) {
-          log.stopAction()
-          return
-        }
-        if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true })
-        generateAbisCode(manifest, outputDir, manifestDir)
-        generateInputsCode(manifest, outputDir)
-        log.stopAction()
+        const { manifest, output, clean, include, exclude } = flags
+        const tasks = MimicConfigHandler.getFilteredTasks(this, {
+          defaultTask: {
+            manifest,
+            types: output,
+            task: '',
+            output: '',
+          },
+          include,
+          exclude,
+        })
+        await runTasks(this, tasks, async (config) => {
+          await codegen(
+            {
+              manifestPath: config.manifest,
+              outputDir: config.types,
+              clean,
+              confirmClean: createConfirmClean(this, config.types, coreLogger),
+            },
+            coreLogger
+          )
+        })
       }
     }
-    function generateAbisCode(manifest: Manifest, outputDir: string, manifestDir: string) {
-      for (const [contractName, path] of Object.entries(manifest.abis)) {
-        const abi = JSON.parse(fs.readFileSync(join(manifestDir, '../', path), 'utf-8'))
-        const abiInterface = AbisInterfaceGenerator.generate(abi, contractName)
-        if (abiInterface.length > 0) fs.writeFileSync(`${outputDir}/${contractName}.ts`, abiInterface)
-      }
-    }
-    function generateInputsCode(manifest: Manifest, outputDir: string) {
-      const inputsInterface = InputsInterfaceGenerator.generate(manifest.inputs)
-      if (inputsInterface.length > 0) fs.writeFileSync(`${outputDir}/index.ts`, inputsInterface)
-    }

packages/cli/src/commands/compile.ts

-Original file line number
+Diff line change
@@ -1,10 +1,9 @@
     import { Command, Flags } from '@oclif/core'
-    import * as fs from 'fs'
-    import * as path from 'path'
-    import ManifestHandler from '../lib/ManifestHandler'
-    import { execBinCommand } from '../lib/packageManager'
-    import log from '../log'
+    import { compile } from '../core'
+    import { runTasks } from '../helpers'
+    import MimicConfigHandler, { taskFilterFlags } from '../lib/MimicConfigHandler'
+    import { coreLogger } from '../log'
     export default class Compile extends Command {
       static override description = 'Compiles task'
@@ Expand All / @@ -15,45 +14,34 @@ export default class Compile extends Command { @@
         task: Flags.string({ char: 't', description: 'task to compile', default: 'src/task.ts' }),
         manifest: Flags.string({ char: 'm', description: 'manifest to validate', default: 'manifest.yaml' }),
         output: Flags.string({ char: 'o', description: 'output directory', default: './build' }),
+        ...taskFilterFlags,
       }
       public async run(): Promise<void> {
         const { flags } = await this.parse(Compile)
-        const { task: taskFile, output: outputDir, manifest: manifestDir } = flags
-        const absTaskFile = path.resolve(taskFile)
-        const absOutputDir = path.resolve(outputDir)
-        if (!fs.existsSync(absOutputDir)) fs.mkdirSync(absOutputDir, { recursive: true })
-        log.startAction('Verifying Manifest')
-        const manifest = ManifestHandler.load(this, manifestDir)
-        log.startAction('Compiling')
-        const ascArgs = [
-          absTaskFile,
-          '--target',
-          'release',
-          '--outFile',
-          path.join(absOutputDir, 'task.wasm'),
-          '--optimize',
-          '--exportRuntime',
-          '--transform',
-          'json-as/transform',
-        ]
-        const result = execBinCommand('asc', ascArgs, process.cwd())
-        if (result.status !== 0) {
-          this.error('AssemblyScript compilation failed', {
-            code: 'BuildError',
-            suggestions: ['Check the AssemblyScript file'],
-          })
-        }
-        log.startAction('Saving files')
-        fs.writeFileSync(path.join(outputDir, 'manifest.json'), JSON.stringify(manifest, null, 2))
-        log.stopAction()
-        console.log(`Build complete! Artifacts in ${outputDir}/`)
+        const { task: taskPath, output, manifest, include, exclude } = flags
+        const tasks = MimicConfigHandler.getFilteredTasks(this, {
+          defaultTask: {
+            manifest,
+            task: taskPath,
+            output,
+            types: '',
+          },
+          include,
+          exclude,
+        })
+        await runTasks(this, tasks, async (config) => {
+          await compile(
+            {
+              manifestPath: config.manifest,
+              taskPath: config.task,
+              outputDir: config.output,
+            },
+            coreLogger
+          )
+          coreLogger.info(`Build complete! Artifacts in ${config.output}/`)
+        })
       }
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLI: Support multiple tasks #196

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

CLI: Support multiple tasks #196

Are you sure you want to change the base?

Uh oh!

CLI: Support multiple tasks #196

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!