Merge pull request #170 from AttilaMihaly/create-missing-output-dirs

Create missing output dirs. #169
finos · Oct 2, 2020 · fa9b7f0 · fa9b7f0
2 parents 8f1f1b5 + 8c60bbf
commit fa9b7f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/cli/cli.js b/cli/cli.js
@@ -7,7 +7,7 @@ const fs = require('fs')
 const readdir = util.promisify(fs.readdir)
 const mkdir = util.promisify(fs.mkdir)
 const readFile = util.promisify(fs.readFile)
-const writeFile = util.promisify(fs.writeFile)
+const fsWriteFile = util.promisify(fs.writeFile)
 // Elm imports
 const worker = require('./Morphir.Elm.CLI').Elm.Morphir.Elm.CLI.init()
 
@@ -82,7 +82,7 @@ async function gen(input, outputPath, options) {
                 await mkdir(fileDir, { recursive: true })
                 console.log(`INSERT - ${filePath}`)
             }
-            return writeFile(filePath, content)
+            return fsWriteFile(filePath, content)
         })
     const filesToDelete = await findFilesToDelete(outputPath, fileMap)
     const deletePromises =
@@ -153,5 +153,11 @@ async function findFilesToDelete(outputPath, fileMap) {
     return Promise.all(await readDir(outputPath, files))
 }
 
+async function writeFile(filePath, content) {
+    await mkdir(path.dirname(filePath), { recursive: true })
+    return await fsWriteFile(filePath, content)
+}
+
 exports.make = make;
-exports.gen = gen;
+exports.gen = gen;
+exports.writeFile = writeFile;
diff --git a/cli/morphir-elm-make.js b/cli/morphir-elm-make.js
@@ -2,13 +2,6 @@
 'use strict'
 
 // NPM imports
-const path = require('path')
-const util = require('util')
-const fs = require('fs')
-const readdir = util.promisify(fs.readdir)
-const lstat = util.promisify(fs.lstat)
-const readFile = util.promisify(fs.readFile)
-const writeFile = util.promisify(fs.writeFile)
 const commander = require('commander')
 const cli = require('./cli')
 
@@ -25,7 +18,7 @@ program
 cli.make(program.projectDir)
     .then((packageDef) => {
         console.log(`Writing file ${program.output}.`)
-        writeFile(program.output, JSON.stringify(packageDef, null, 4))
+        cli.writeFile(program.output, JSON.stringify(packageDef, null, 4))
             .then(() => {
                 console.log('Done.')
             })