Skip to content

Commit

Permalink
fix(compilerPlugin): corrected compileFromFiles when only a single fi…
Browse files Browse the repository at this point in the history
…le entry is passed
  • Loading branch information
z3dev committed Sep 13, 2021
1 parent 1e201a2 commit 9437e91
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions src/compilerPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const compilerPlugin = (store) => {
}

const compileFromFiles = (store, files, parameterValues) => {
//console.log('compileFromFile',files)
// console.log('compileFromFiles',files)

const handleParamsOrSolids = (crap, paramsOrSolids) => {
if (paramsOrSolids.type === 'solids') {
Expand All @@ -46,16 +46,21 @@ const compileFromFiles = (store, files, parameterValues) => {

web.walkFileTree(files)
.then((filesAndFolders) => {
store.commit('setStatus','compiling...')

const data = { filesAndFolders, serialize: false }
const objects = evaluation.rebuildGeometry(data, handleParamsOrSolids)
if (filesAndFolders.length === 1 && filesAndFolders[0].children && filesAndFolders[0].children.length === 1) {
// single file entry
const fileEntry = filesAndFolders[0].children[0]
compileFromSource(store, fileEntry, parameterValues)
} else {
store.commit('setStatus','compiling...')
const data = { filesAndFolders, serialize: false }
const objects = evaluation.rebuildGeometry(data, handleParamsOrSolids)
}
})
.then(() => {
store.commit('setStatus','done')
})
.catch((error) => {
store.commit('setStatus',`error (${error.asString()})`)
store.commit('setStatus',`${error}`)
})
}

Expand All @@ -73,7 +78,7 @@ const compileFromSource = (store, fileEntry, parameterValues) => {
const data = { filesAndFolders: [ fileEntry ], parameterValues, serialize: false }
const objects = evaluation.rebuildGeometry(data, handleParamsOrSolids)
} catch (error) {
store.commit('setStatus',`error (${error})`)
store.commit('setStatus',`${error}`)
}
}

Expand Down

0 comments on commit 9437e91

Please sign in to comment.