@pega/dx-component-builder-sdk 0.1.28 → 0.1.30

package/package.json

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

package/src/cli.js

@@ -9,7 +9,7 @@ import {
   createAllComponents,
   deleteComponent,
   deleteAllComponents,
-  generateMissingCompanions,
+  scanAndFix,
   listComponents,
   mapAllComponents,
   overrideComponent,
@@ -38,7 +38,7 @@ const TASKS = {
   DELETE_ALL: "deleteAll",
   AUTHENTICATE: 'authenticate',
   UPGRADE: 'upgrade',
-  GENERATE_MISSING_COMPANIONS: 'generateMissingCompanions'
+  SCAN_AND_FIX: 'scanAndFix'
 };
 
 const parseArgumentsIntoOptions = rawArgs => {
@@ -128,8 +128,8 @@ export default async (args = []) => {
       upgrade(options);
       break;
     }
-    case TASKS.GENERATE_MISSING_COMPANIONS: {
-      generateMissingCompanions(options);
+    case TASKS.SCAN_AND_FIX: {
+      scanAndFix(options);
       break;
     }
     default: {

package/src/tasks/create/templates/SDK-React/field/Boolean/index.tsx.mustache

@@ -8,7 +8,6 @@ import {
   FormHelperText
 } from '@material-ui/core';
 import handleEvent from '@pega/react-sdk-components/lib/components/helpers/event-utils';
-import FieldValueList from '@pega/react-sdk-components/lib/components/designSystemExtension/FieldValueList';
 import PropTypes from 'prop-types';
 import FieldValueList from '@pega/react-sdk-components/lib/components/designSystemExtension/FieldValueList';
 import Styled{{COMPONENT_CLASS_NAME}}Wrapper from './styles';

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

@@ -155,7 +155,8 @@ export const validateCompileAll = async (
     const type = "Field";
     const subtype = COMPONENT_SCHEMA.subtype.field[fieldIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
-    const componentName = "".concat(prefixNoSpace).concat(COMPONENT_SCHEMA.subtype.field[fieldIdx].name);
+    const componentNameNoSpace = COMPONENT_SCHEMA.subtype.field[fieldIdx].name.replace(/\s+/g, '');
+    const componentName = "".concat(prefixNoSpace).concat(componentNameNoSpace);
     const componentLabel = "".concat(prefix).concat(" ").concat(COMPONENT_SCHEMA.subtype.field[fieldIdx].name);
     const description = componentLabel;
 
@@ -179,12 +180,13 @@ export const validateCompileAll = async (
     const type = "Template";
     const subtype = COMPONENT_SCHEMA.subtype.template[templateIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
+    let templateNameOriginal  = COMPONENT_SCHEMA.subtype.template[templateIdx].name;
     let templateName =  convertIntoPascalCase(COMPONENT_SCHEMA.subtype.template[templateIdx].name);
     let templateLabel = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.template[templateIdx].name);
-    if (templateName.indexOf("region") >= 0) {
-      templateName = templateName.replace(" region", "");
-      templateName = "TwoColumn".concat(templateName);
-      templateLabel = "Two Column".concat(templateName);
+    if (templateNameOriginal.indexOf("region") >= 0) {
+      let templateNameBase = convertIntoPascalCase(templateNameOriginal.replace(" region", ""));
+      templateName = "TwoColumn".concat(templateNameBase);
+      templateLabel = "Two Column ".concat(templateNameBase);
     }
     const componentName = "".concat(prefixNoSpace).concat(templateName);
     const componentLabel = "".concat(prefix).concat(" ").concat(templateLabel);
@@ -211,10 +213,11 @@ export const validateCompileAll = async (
     const type = "Widget";
     const subtype = COMPONENT_SCHEMA.subtype.widget[widgetIdx].value;
     const prefixNoSpace = prefix.replace(/\s+/g, '');
+    let widgetNameOriginal  = COMPONENT_SCHEMA.subtype.template[widgetIdx].name;
     let widgetName = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat("Widget");
     let widgetLabel = convertIntoPascalCase(COMPONENT_SCHEMA.subtype.widget[widgetIdx].name).concat(" Widget");
-    if (widgetName.indexOf("&") >= 0) {
-      widgetName = widgetName.replace(" & ", "");
+    if (widgetNameOriginal.indexOf("&") >= 0) {
+      widgetName = convertIntoPascalCase(widgetNameOriginal.replace(" & ", ""));
     }
     const componentName = "".concat(prefixNoSpace).concat(widgetName);
     const componentLabel = "".concat(prefix).concat(" ").concat(widgetLabel);
@@ -302,7 +305,7 @@ export const validateCompile = async (
 
       let componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
       if (components.includes(componentKey)) {
-        console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+        console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       }
 
       return;
@@ -310,7 +313,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -318,7 +321,7 @@ export const validateCompile = async (
     // test for constellation
     const componentsConstellation = await getComponents(false, CATEGORY_CONSTELLATION);
     if (componentsConstellation.includes(componentKey)) {
-      console.log(chalk.red(`${componentKey} companion component already exists in ${targetDirectoryConstellation}`));
+      console.log(chalk.red(`${componentKey} associated component already exists in ${targetDirectoryConstellation}`));
       return;
     }
   }
@@ -368,7 +371,7 @@ export const validateCompile = async (
     console.log(chalk.green(`created ${componentKey} component in ${targetDirectory}`));
   }
 
-  console.log(chalk.green(`created ${componentKey} companion component in ${targetDirectoryConstellation}`));
+  console.log(chalk.green(`created ${componentKey} associated component in ${targetDirectoryConstellation}`));
 
 };
 

package/src/tasks/index.js

@@ -14,4 +14,4 @@ export { default as authenticate } from './authenticate/index.js';
 export { default as upgrade } from './upgrade/index.js';
 export { default as buildComponent } from './build/index.js';
 export { default as buildAllComponents } from './build-all/index.js';
-export { default as generateMissingCompanions } from './generate-missing-companions/index.js';
+export { default as scanAndFix } from './scan-and-fix/index.js';

package/src/tasks/publish/index.js

@@ -100,7 +100,7 @@ export default async options => {
       {
         title: 'Clean up companion',
         task: async () => {
-          removeCompanionConfigJson(componentKey);
+          await removeCompanionConfigJson(componentKey);
         }
       }
     ],

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

@@ -131,20 +131,20 @@ 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.rm('dist', { recursive: true }, err => {
-      if (err) {
-        throw err;
-      }
-    });
+    //fs.rm('dist', { recursive: true }, err => {
+    //  if (err) {
+    //    throw err;
+     // }
+    //});
   }
   else {
     if (fs.existsSync(configExtJson)) {
       configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config-ext.json`)).toString();
-      fs.rm('dist', { recursive: true }, err => {
-        if (err) {
-          throw err;
-        }
-      });
+      //fs.rm('dist', { recursive: true }, err => {
+      //  if (err) {
+      //    throw err;
+      //  }
+      //});
     }
     else {
       const tempConfig = { "componentKey" : ""};
@@ -161,6 +161,14 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   return { zipContent, configContent };
 };
 
+export const removeDist = async () => {
+  fs.rm('dist', { recursive: true }, err => {
+    if (err) {
+      throw err;
+    }
+  });
+}
+
 export const publishComponentToServer = async data => {
   const { configContent, zipContent, rulesetName, rulesetVersion } = data;
   let { componentKey } = data;

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

@@ -15,32 +15,12 @@ import { getPublishComponentQuestions,
   zipComponent, 
   getBuildCategory, 
   mapConfigJsonToCompanion,
-  removeCompanionConfigJson } from './helper.js';
+  removeCompanionConfigJson,
+  removeDist
+ } from './helper.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 getPublishComponentQuestions(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(
     [
 
@@ -65,7 +45,7 @@ export default async options => {
         }
       },
       {
-        title: 'Lint companion component',
+        title: 'Lint associated component',
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -73,33 +53,33 @@ export default async options => {
         }
       },
       {
-        title: 'Map config to companion component',
+        title: 'Map config to associated component',
         task: async () => {
-          mapConfigJsonToCompanion(componentKey);
+          await mapConfigJsonToCompanion(componentKey);
         }
       },
       {
-        title: 'Bundle companion component',
+        title: 'Bundle associated component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
-        title: 'Zip companion component',
+        title: 'Zip associated component',
         task: async () => {
           const output = await zipComponent(componentKey, CATEGORY_CONSTELLATION);
           content = { ...content, ...output, componentKey };
         }
       },
       {
-        title: 'Publish companion component',
+        title: 'Publish associated component',
         task: async () => {
           await publishComponentToServer(content);
         }
       },
       {
-        title: 'Clean up companion',
+        title: 'Clean up associated component',
         task: async () => {
-          removeCompanionConfigJson(componentKey);
+          await removeCompanionConfigJson(componentKey);
         }
       }
     ],
@@ -108,6 +88,11 @@ export default async options => {
     }
   );
 
+  return customTasks;
+}
+
+export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options) {
+
   const overrideTasks = new Listr(
     [
       {
@@ -154,27 +139,68 @@ 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 getPublishComponentQuestions(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("Publishing: " + components[index].name));
-      await customTasks.run().catch(err => {
-         console.log(chalk.bold.red(err.toString()));
+
+      for (var index in components) {
+        componentKey = components[index].value;
+        console.log(chalk.bold.green("Publishing: " + components[index].name));
+
+        let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+        await myCustomTasks.run().catch(err => {
+          console.log(chalk.bold.red(err.toString()));
       });
-    }
+
+
+      }
+
+
   }
   else {
     for (var index in components) {
       componentKey = components[index].value;
       console.log(chalk.bold.green("Publishing: " + components[index].name));
-      await overrideTasks.run().catch(err => {
-         console.log(chalk.bold.red(err.toString()));
-      });
+
+      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options);
+
+      await myOverrideTasks.run().catch(err => {
+        console.log(chalk.bold.red(err.toString()));
+     });
     }
+
   }
 
 
+  // once done, remove leftover dist directory
+  removeDist();
+
 
   return true;
 };

package/src/tasks/validator/index.js

@@ -23,7 +23,7 @@ const combinationTypes = ['PAGE', 'CASE'];
 const allowedSubtypes = [
   ...new Set([
     ...COMPONENT_SCHEMA.subtype.field.map(({ value }) => value),
-    ...COMPONENT_SCHEMA.subtype.template,
+    ...COMPONENT_SCHEMA.subtype.template.map(({ value }) => value),
     ...COMPONENT_SCHEMA.subtype.widget.map(({ value }) => value)
   ])
 ];
@@ -32,7 +32,7 @@ const allowedSubtypes = [
 const allowedOverrideSubtypes = [
   ...new Set([
     ...COMPONENT_SCHEMA.subtype.field.map(({ value }) => value),
-    ...COMPONENT_SCHEMA.subtype.template,
+    ...COMPONENT_SCHEMA.subtype.template.map(({ value }) => value),
     ...COMPONENT_SCHEMA.subtype.widget.map(({ value }) => value)
   ]), "ACTION", "DATA_CAPTURE", "SUMMARY", "CASEVIEW", "DATAVIEW", "LIST"
 ];