fix(sasjs-build): recognise global targets, fix compile-build logic (#…

…246) * fix(sasjs-build): recognise global targets * fix(sasjs-build): fix destination folder paths in compile check * chore(*): throw error in tests if target already exists
sasjs · Nov 18, 2020 · a3be967 · a3be967
1 parent 2581710
commit a3be967
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/commands/build.js b/src/commands/build.js
@@ -91,7 +91,7 @@ export async function build(
     console.log(chalk.white('Skipping compiling of build folders...'))
   } else {
     console.log(chalk.redBright(result.message))
-    await compile()
+    await compile(targetName)
   }
 
   await createFinalSasFiles()
@@ -955,13 +955,16 @@ async function validCompiled(servicesBuildFolders, jobsBuildFolders) {
       message: `Build Folder doesn't exists: ${buildDestinationFolder}`
     }
 
-  const subFolders = await getSubFoldersInFolder(buildDestinationServ)
+  const serviceSubFolders = await getSubFoldersInFolder(buildDestinationServ)
 
   const servicesPresent = servicesBuildFolders.every((folder) =>
-    subFolders.includes(folder)
+    serviceSubFolders.includes(folder)
   )
+
+  const jobSubFolders = await getSubFoldersInFolder(buildDestinationJobs)
+
   const jobsPresent = jobsBuildFolders.every((folder) =>
-    subFolders.includes(folder)
+    jobSubFolders.includes(folder)
   )
 
   if (servicesPresent && jobsPresent) {
@@ -986,7 +989,7 @@ async function validCompiled(servicesBuildFolders, jobsBuildFolders) {
 
     if (returnObj.compiled) {
       await asyncForEach(jobsBuildFolders, async (buildFolder) => {
-        const folderPath = path.join(buildDestinationServ, buildFolder)
+        const folderPath = path.join(buildDestinationJobs, buildFolder)
         const subFolders = await getSubFoldersInFolder(folderPath)
         const filesNamesInPath = await getFilesInFolder(folderPath)
         if (subFolders.length == 0 && filesNamesInPath.length == 0) {

diff --git a/test/helpers.js b/test/helpers.js
@@ -191,6 +191,9 @@ global.addToGlobalConfigs = async (buildTarget) => {
   let globalConfig = await getGlobalRcFile()
   if (globalConfig) {
     if (globalConfig.targets && globalConfig.targets.length) {
+      if (globalConfig.targets.some((t) => t.name === buildTarget.name)) {
+        throw new Error('Target already exists.')
+      }
       globalConfig.targets.push(buildTarget)
     } else {
       globalConfig.targets = [buildTarget]