Log errors and warnings to the terminal

pull/4481/head
ioedeveloper 10 months ago
parent 331c8591b1
commit 6435e25a9c
  1. 20
      apps/circuit-compiler/src/app/services/circomPluginClient.ts
  2. 2
      package.json
  3. 7
      yarn.lock

@ -130,11 +130,11 @@ export class CircomPluginClient extends PluginClient {
if (parseErrors && (parseErrors.length > 0)) { if (parseErrors && (parseErrors.length > 0)) {
if (parseErrors[0].type === 'Error') { if (parseErrors[0].type === 'Error') {
this.internalEvents.emit('circuit_parsing_errored', parseErrors, filePathToId) this.internalEvents.emit('circuit_parsing_errored', parseErrors, filePathToId)
// @ts-ignore this.logCompilerReport(parseErrors)
this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
return return
} else if (parseErrors[0].type === 'Warning') { } else if (parseErrors[0].type === 'Warning') {
this.internalEvents.emit('circuit_parsing_warning', parseErrors, filePathToId) this.internalEvents.emit('circuit_parsing_warning', parseErrors, filePathToId)
this.logCompilerReport(parseErrors)
} }
} else { } else {
this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId) this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
@ -151,8 +151,7 @@ export class CircomPluginClient extends PluginClient {
if (circuitProgram.length < 1) { if (circuitProgram.length < 1) {
const circuitErrors = circuitApi.report() const circuitErrors = circuitApi.report()
// @ts-ignore this.logCompilerReport(circuitErrors)
this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
throw new Error(circuitErrors) throw new Error(circuitErrors)
} else { } else {
this.lastCompiledFile = path this.lastCompiledFile = path
@ -189,11 +188,11 @@ export class CircomPluginClient extends PluginClient {
if (parseErrors && (parseErrors.length > 0)) { if (parseErrors && (parseErrors.length > 0)) {
if (parseErrors[0].type === 'Error') { if (parseErrors[0].type === 'Error') {
this.internalEvents.emit('circuit_parsing_errored', parseErrors) this.internalEvents.emit('circuit_parsing_errored', parseErrors)
// @ts-ignore this.logCompilerReport(parseErrors)
this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
return return
} else if (parseErrors[0].type === 'Warning') { } else if (parseErrors[0].type === 'Warning') {
this.internalEvents.emit('circuit_parsing_warning', parseErrors) this.internalEvents.emit('circuit_parsing_warning', parseErrors)
this.logCompilerReport(parseErrors)
} }
} else { } else {
this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId) this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
@ -210,8 +209,7 @@ export class CircomPluginClient extends PluginClient {
if (r1csProgram.length < 1) { if (r1csProgram.length < 1) {
const r1csErrors = r1csApi.report() const r1csErrors = r1csApi.report()
// @ts-ignore this.logCompilerReport(r1csErrors)
this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
throw new Error(r1csErrors) throw new Error(r1csErrors)
} else { } else {
this.internalEvents.emit('circuit_generating_r1cs_done') this.internalEvents.emit('circuit_generating_r1cs_done')
@ -395,4 +393,10 @@ export class CircomPluginClient extends PluginClient {
} }
} }
} }
async logCompilerReport (report: CompilerReport[]): Promise<void> {
this.call('terminal', 'log', { type: 'log', value: JSON.stringify(report, null, 2) })
if (report[0].type === 'Error') this.call('terminal', 'log', { type: 'error', value: 'previous errors were found' })
if (report[0].type === 'Warning') this.call('terminal', 'log', { type: 'log', value: 'previous warnings were found' })
}
} }

@ -164,7 +164,7 @@
"brace": "^0.8.0", "brace": "^0.8.0",
"change-case": "^4.1.1", "change-case": "^4.1.1",
"chokidar": "^2.1.8", "chokidar": "^2.1.8",
"circom_wasm": "https://github.com/ioedeveloper/circom_wasm.git", "circom_wasm": "^0.2.1",
"color-support": "^1.1.3", "color-support": "^1.1.3",
"commander": "^9.4.1", "commander": "^9.4.1",
"core-js": "^3.6.5", "core-js": "^3.6.5",

@ -10537,9 +10537,10 @@ circom_runtime@0.1.22:
dependencies: dependencies:
ffjavascript "0.2.57" ffjavascript "0.2.57"
"circom_wasm@https://github.com/ioedeveloper/circom_wasm.git": circom_wasm@^0.2.1:
version "0.2.0" version "0.2.1"
resolved "https://github.com/ioedeveloper/circom_wasm.git#e558f8a449ac12151e735c6923c65f33b9b953ff" resolved "https://registry.yarnpkg.com/circom_wasm/-/circom_wasm-0.2.1.tgz#11eeceb497c03461676b3bc21d7d71ac3310dd58"
integrity sha512-57Xhg3nUcQX+aMr+sH8XyxklpPgAWohjGkaEbiJDv3UiUveFAB2pOFOOE4whoMm7mjxKbO4n4mVs1oC031ApQQ==
circular-json@^0.3.0: circular-json@^0.3.0:
version "0.3.3" version "0.3.3"

Loading…
Cancel
Save