Ensure extension is replaced

apps/circuit-compiler/src/app/actions/index.ts

@@ -29,7 +29,7 @@ export const computeWitness = async (plugin: CircomPluginClient, appState: AppSt
         const wtns = await snarkjs.wtns.exportJson(witness)
         const wtnsJson = wtns.map(wtn => wtn.toString())
         const fileName = extractNameFromKey(appState.filePath)
-        const writePath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '.wtn.json')}`
+        const writePath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '_js')}/${fileName.replace('.circom', '.wtn.json')}`
 
         await plugin.call('fileManager', 'writeFile', writePath, JSON.stringify(wtnsJson, null, 2))
         plugin._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'wtns.exportJson', writePath])

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -181,7 +181,7 @@ export class CircomPluginClient extends PluginClient {
         this.lastCompiledFile = path
         const fileName = extractNameFromKey(path)
 
-        this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + '/' + fileName.replace('circom', 'wasm')
+        this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + '/' + fileName.replace('.circom', '.wasm')
         // @ts-ignore
         await this.call('fileManager', 'writeFile', this.lastCompiledCircuitPath, circuitProgram, { encoding: null })
         const fileContent = this.lastParsedFiles[path]
@@ -235,7 +235,7 @@ export class CircomPluginClient extends PluginClient {
       const { stdout, stderr } = await this.call('circom', 'run', path, versionToInstall, { prime: prime, wasm: "", inputs: "" })
       const fileName = extractNameFromKey(path)
 
-      this.lastCompiledCircuitPath = pathModule.normalize(extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('circom', 'wasm'))
+      this.lastCompiledCircuitPath = pathModule.normalize(extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '_js') + "/" + fileName.replace('.circom', '.wasm'))
       if (stderr) this.call('terminal', 'log', { type: 'error', value: stderr })
       if (stdout) this.call('terminal', 'log', { type: 'log', value: stdout })
     } catch (error) {
@@ -290,7 +290,7 @@ export class CircomPluginClient extends PluginClient {
         throw new Error(r1csErrors)
       } else {
         const fileName = extractNameFromKey(path)
-        const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'r1cs')
+        const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('.circom', '.r1cs')
 
         // @ts-ignore
         await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)