@pega/dx-component-builder-sdk 0.1.32 → 0.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/dx-component-builder-sdk",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/tasks/build/helper.js

@@ -18,6 +18,20 @@ import {
 import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH, COMPONENT_SCHEMA, CATEGORY_CUSTOM } from '../../constants.js';
 
 
+export const cleanUp = async () => {
+  fs.rm('dist/components', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+
+  fs.rm('lib', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+}
+
 export const getBuildCategory = async (options) => {
   const categoryType = getOptionsCategory(options);
 
@@ -78,10 +92,10 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   const zipContent = zip.toBuffer().toString('base64');
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
-  fs.rmd('dist', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  // fs.rmd('dist/components', { recursive: true }, err => {
+  //   if (err) {
+  //     throw err;
+  //   }
+  // });
   return { zipContent, configContent };
 };

package/src/tasks/build/index.js

@@ -6,7 +6,7 @@ import validate from '../validator/index.js';
 
 import bundleComponent from '../bundle/index.js';
 import lintComponent from '../linter/index.js';
-import { getBuildComponentQuestions, getBuildCategory } from './helper.js';
+import { getBuildComponentQuestions, getBuildCategory, cleanUp } from './helper.js';
 import { getComponentDirectoryPath, showVersion, getOptionsCategory } from '../../util.js';
 
 import { CATEGORY_CUSTOM } from '../../constants.js';
@@ -105,5 +105,8 @@ export default async options => {
     });
   }
 
+
+  cleanUp();
+
   return true;
 };

package/src/tasks/build-all/helper.js

@@ -12,6 +12,19 @@ import {
 } from '../../util.js';
 import { COMPONENT_SCHEMA, CATEGORY_CUSTOM } from '../../constants.js';
 
+export const cleanUp = async () => {
+  fs.rm('dist/components', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+
+  fs.rm('lib', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+}
 
 export const getBuildCategory = async (options) => {
   const categoryType = getOptionsCategory(options);
@@ -62,10 +75,10 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   const zipContent = zip.toBuffer().toString('base64');
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
-  fs.rmd('dist', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  // fs.rmd('dist/components', { recursive: true }, err => {
+  //   if (err) {
+  //     throw err;
+  //   }
+  // });
   return { zipContent, configContent };
 };

package/src/tasks/build-all/index.js

@@ -6,32 +6,12 @@ import validate from '../validator/index.js';
 
 import bundleComponent from '../bundle/index.js';
 import lintComponent from '../linter/index.js';
-import { getBuildComponentQuestions, getBuildCategory } from './helper.js';
+import { getBuildComponentQuestions, getBuildCategory, cleanUp } from './helper.js';
 import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj } from '../../util.js';
 
 import { CATEGORY_CUSTOM } from '../../constants.js';
 
-export default async options => {
-  showVersion();
-
-  const catQuestion = await getBuildCategory(options);
-  const catAnwers = await inquirer.prompt(catQuestion);
-
-  let category = catAnwers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
-  }
-
-  const components = await getComponentsObj(false, category);
-  const questions = await getBuildComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const { sourceMap, devBuild } = answers;
-
-  let content = {
-    ...answers
-  };
-
-  var componentKey;
+export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options) {
 
   const customTasks = new Listr(
     [
@@ -71,6 +51,12 @@ export default async options => {
     }
   );
 
+  return customTasks;
+}
+
+
+export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options) {
+
   const overrideTasks = new Listr(
     [
       {
@@ -97,12 +83,40 @@ export default async options => {
     }
   );
 
+  return overrideTasks;
+}
+
+export default async options => {
+  showVersion();
+
+  const catQuestion = await getBuildCategory(options);
+  const catAnwers = await inquirer.prompt(catQuestion);
+
+  let category = catAnwers.category;
+  if (category == null) {
+    category = getOptionsCategory(options);
+  }
+
+  const components = await getComponentsObj(false, category);
+  const questions = await getBuildComponentQuestions(category);
+  const answers = await inquirer.prompt(questions);
+  const { sourceMap, devBuild } = answers;
+
+  let content = {
+    ...answers
+  };
+
+  var componentKey;
+
 
   if (category === CATEGORY_CUSTOM) {
     for (var index in components) {
       componentKey = components[index].value;
       console.log(chalk.bold.green("Building: " + components[index].name));
-      await customTasks.run().catch(err => {
+
+      let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+      await myCustomTasks.run().catch(err => {
          console.log(chalk.bold.red(err.toString()));
       });
     }
@@ -111,11 +125,16 @@ export default async options => {
     for (var index in components) {
       componentKey = components[index].value;
       console.log(chalk.bold.green("Building: " + components[index].name));
-      await overrideTasks.run().catch(err => {
+
+      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+      await mOverrideTasks.run().catch(err => {
          console.log(chalk.bold.red(err.toString()));
       });
     }
   }
 
+  cleanUp();
+
   return true;
 };

package/src/tasks/publish/helper.js

@@ -138,7 +138,12 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   let configContent = "{ }";
   if (category === CATEGORY_CUSTOM || category === CATEGORY_CONSTELLATION) {
     configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
-    fs.rmdir('dist', { recursive: true }, err => {
+    fs.rmdir('dist/components', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+    fs.rmdir('lib', { recursive: true }, err => {
       if (err) {
         throw err;
       }
@@ -147,7 +152,12 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   else {
     if (fs.existsSync(configExtJson)) {
       configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config-ext.json`)).toString();
-      fs.rmdir('dist', { recursive: true }, err => {
+      fs.rmdir('dist/components', { recursive: true }, err => {
+        if (err) {
+          throw err;
+        }
+      });
+      fs.rmdir('lib', { recursive: true }, err => {
         if (err) {
           throw err;
         }

package/src/tasks/publish-all/helper.js

@@ -161,8 +161,14 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   return { zipContent, configContent };
 };
 
-export const removeDist = async () => {
-  fs.rm('dist', { recursive: true }, err => {
+export const cleanUp = async () => {
+  fs.rm('dist/components', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+
+  fs.rm('lib', { recursive: true }, err => {
     if (err) {
       throw err;
     }

package/src/tasks/publish-all/index.js

@@ -16,7 +16,7 @@ import { getPublishComponentQuestions,
   getBuildCategory, 
   mapConfigJsonToCompanion,
   removeCompanionConfigJson,
-  removeDist
+  cleanUp
  } from './helper.js';
 
 
@@ -195,8 +195,8 @@ export default async options => {
   }
 
 
-  // once done, remove leftover dist directory
-  removeDist();
+  // once done, remove leftover directories
+  cleanUp();
 
 
   return true;