@pega/dx-component-builder-sdk 0.1.46 → 0.1.48

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

@@ -3,25 +3,31 @@ import Listr from 'listr';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
-import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj } from '../../util.js';
-import bundleComponent from '../bundle/index.js';
+import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj, getFramework, getLocalComponentKeyFromConfig, convertIntoKebabCase, convertIntoPascalCase } from '../../util.js';
+import { bundleReactComponent, bundleAngularComponent} from '../bundle/index.js';
 import { updateComponentMap  } from '../map/map.js';
 import { lintComponent } from '../linter/index.js';
 import { CATEGORY_CONSTELLATION, CATEGORY_CUSTOM } from '../../constants.js';
 
 
-import { getPublishComponentQuestions, 
-  publishComponentToServer, 
-  zipComponent, 
-  getBuildCategory, 
+import { getPublishComponentQuestions,
+  publishComponentToServer,
+  zipComponent,
+  getBuildCategory,
   mapConfigJsonToCompanion,
   removeCompanionConfigJson,
   cleanUp
  } from './helper.js';
 
 
-export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options) {
-  const customTasks = new Listr(
+export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options, framework, associatedComponentKey) {
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
+
+  // don't fetch if testing
+  const doFetch = options.params.length >= 7 ? false : true;
+
+  return new Listr(
     [
 
       {
@@ -31,7 +37,7 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
         }
       },
       {
-        title: 'Lint component',
+        title: `Lint ${sFramework} component`,
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, category);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -47,7 +53,7 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
       {
         title: 'Lint associated component',
         task: async () => {
-          const targetDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
+          const targetDirectory = await getComponentDirectoryPath(associatedComponentKey, CATEGORY_CONSTELLATION);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
           await lintComponent(targetDirectory);
         }
@@ -59,27 +65,39 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
         }
       },
       {
-        title: 'Bundle associated component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
+        title: `Bundle React component ${sDevBuild}`,
+        task: async () => await bundleReactComponent(componentKey, sourceMap, devBuild, category),
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined),
+        enabled: ok => framework === "SDK-React"
+      },
+      {
+        title: `Bundle Angular component ${sDevBuild}`,
+        task: async () => await bundleAngularComponent(componentKey, sourceMap, devBuild, category),
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined),
+        enabled: ok => framework === "SDK-Angular"
+      },
+      {
+        title: `Bundle associated component ${sDevBuild}`,
+        task: async () => await bundleReactComponent(associatedComponentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
         title: 'Zip associated component',
         task: async () => {
-          const output = await zipComponent(componentKey, CATEGORY_CONSTELLATION);
-          content = { ...content, ...output, componentKey };
+          const output = await zipComponent(associatedComponentKey, CATEGORY_CONSTELLATION);
+          content = { ...content, ...output, componentKey : associatedComponentKey };
         }
       },
       {
         title: 'Publish associated component',
         task: async () => {
-          await publishComponentToServer(content);
+          await publishComponentToServer(content, doFetch);
         }
       },
       {
         title: 'Clean up associated component',
         task: async () => {
-          await removeCompanionConfigJson(componentKey);
+          await removeCompanionConfigJson(associatedComponentKey);
         }
       }
     ],
@@ -88,12 +106,13 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
     }
   );
 
-  return customTasks;
 }
 
-export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options) {
+export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options, framework) {
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
 
-  const overrideTasks = new Listr(
+  return new Listr(
     [
       {
         title: 'Validate config schema',
@@ -102,7 +121,7 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
         }
       },
       {
-        title: 'Lint component',
+        title: `Lint ${sFramework} component`,
         task: async () => {
           const targetDirectory = await getComponentDirectoryPath(componentKey, category);
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
@@ -110,9 +129,16 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
         }
       },
       {
-        title: 'Bundle component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
-        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
+        title: `Bundle React component ${sDevBuild}`,
+        task: async () => await bundleReactComponent(componentKey, sourceMap, devBuild, category),
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined),
+        enabled: ok => framework === "SDK-React"
+      },
+      {
+        title: `Bundle Angular component ${sDevBuild}`,
+        task: async () => await bundleAngularComponent(componentKey, sourceMap, devBuild, category),
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined),
+        enabled: ok => framework === "SDK-Angular"
       },
       {
         title: 'Update component map',
@@ -139,40 +165,88 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
     }
   );
 
-  return overrideTasks;
 }
 
 
 export default async options => {
   showVersion();
 
-  const catQuestion = await getBuildCategory(options);
-  const catAnswers = await inquirer.prompt(catQuestion);
+  let componentKey;
+  let sourceMap;
+  let devBuild;
+  let content;
+  let category;
+  let components;
 
-  let category = catAnswers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
-  }
+  const framework = await getFramework();
 
-  const components = await getComponentsObj(false, category);
-  const questions = await getPublishComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const {sourceMap, devBuild } = answers;
+  if (options.params.length >= 7) {
+    category = options.params[3];
+    const rulesetName = options.params[4];
+    const rulesetVersion = options.params[5];
+    const dBuild = options.params[6];
+    devBuild = dBuild === 'Y' || dBuild === 'y' || dBuild === true || dBuild === 'true';
 
-  let content = {
-    ...answers
-  };
+    content = { componentKey, rulesetName, rulesetVersion, devBuild };
 
-  var componentKey;
+    components = await getComponentsObj(false, category);
 
+    // end if find no componets
+    if (components.length == 0) {
+      console.log(chalk.redBright("No components to publish"));
+      process.exit(1);
+    }
+
+  } else {
+    const catQuestion = await getBuildCategory(options);
+    const catAnswers = await inquirer.prompt(catQuestion);
+
+  
+    category = catAnswers.category;
+    if (category == null) {
+      category = getOptionsCategory(options);
+    }
+
+    components = await getComponentsObj(false, category);
+
+    // end if find no componets
+    if (components.length == 0) {
+      console.log(chalk.redBright("No components to publish"));
+      process.exit(1);
+    }
+  
+    const questions = await getPublishComponentQuestions(category);
+    const answers = await inquirer.prompt(questions);
+    ({sourceMap, devBuild } = answers);
+  
+    content = {
+      ...answers
+    };
+  }
 
   if (category === CATEGORY_CUSTOM) {
 
-      for (var index in components) {
-        componentKey = components[index].value;
-        console.log(chalk.bold.green("Publishing: " + components[index].name));
+    for (const component of components) {
+        let componentKey = component.value;
+        const componentKeyName = component.name;
+        console.log(chalk.bold.green(`Publishing: ${componentKeyName}`));
+
+        let associatedComponentKey = componentKey;
 
-        let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options);
+        switch (framework) {
+          case "SDK-Angular":
+            // componentKey is in Pascal case, which is associated, need to convert to Kabab case
+            let arComp = componentKey.split("/");
+            arComp[1] = convertIntoKebabCase(convertIntoPascalCase(arComp[1]));
+            componentKey = arComp.join("/");
+            break;
+          case "SDK-React":
+            break;
+          case "SDK-WebComponents":
+            break;
+        }
+
+        let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options, framework, associatedComponentKey);
 
         await myCustomTasks.run().catch(err => {
           console.log(chalk.bold.red(err.toString()));
@@ -181,11 +255,13 @@ export default async options => {
 
   }
   else {
-    for (var index in components) {
-      componentKey = components[index].value;
-      console.log(chalk.bold.green("Publishing: " + components[index].name));
 
-      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options);
+    for (const component of components) {
+      const componentKey = component.value;
+      const componentKeyName = component.name;
+      console.log(chalk.bold.green(`Publishing: ${componentKeyName}`));
+
+      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options, framework);
 
       await myOverrideTasks.run().catch(err => {
         console.log(chalk.bold.red(err.toString()));
@@ -196,7 +272,7 @@ export default async options => {
 
 
   // once done, remove leftover directories
-  cleanUp();
+  await cleanUp();
 
 
   return true;

package/src/tasks/rename/index.js

@@ -8,7 +8,7 @@ import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
 
-import { checkPathAccess, showVersion, getComponentsObj, getDirectoryFiles } from '../../util.js';
+import { checkPathAccess, showVersion, getComponentsObj, getDirectoryFiles, getFramework } from '../../util.js';
 import { CATEGORY_CONSTELLATION, 
   CATEGORY_CUSTOM,
   SDK_CONFIG_JSON_FILENAME,
@@ -25,6 +25,7 @@ const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
 
 import {
   convertIntoPascalCase,
+  convertIntoKebabCase,
   getComponentDirectoryPath,
   getPegaConfig,
   getComponentDefaults,
@@ -87,14 +88,31 @@ export const updateFile = async (
     oldComponentKeyPC,
     newComponentKeyPC,
     targetDirectory,
+    framework
 ) => {
 
   let fileData = fs.readFileSync(join(targetDirectory, "/", fileName), { encoding: 'utf8' });
 
   if (fileData.indexOf(oldComponentKeyPC) >= 0) {
     fileData = fileData.replaceAll(oldComponentKeyPC, newComponentKeyPC);
-
+    fileData = fileData.replaceAll(convertIntoKebabCase(oldComponentKeyPC), convertIntoKebabCase(newComponentKeyPC));
+    
     fs.writeFileSync(join(targetDirectory, "/", fileName), fileData, { encoding: 'utf8' });
+
+    switch (framework) {
+      case "SDK-Angular":
+        if (fileName.indexOf(".component") >=0 ) {
+          const newFileName = fileName.replaceAll(convertIntoKebabCase(oldComponentKeyPC), convertIntoKebabCase(newComponentKeyPC));
+
+          fs.renameSync(join(targetDirectory, "/", fileName), join(targetDirectory, "/", newFileName));
+        }
+        break;
+      case "SDK-React":
+        break;
+      case "SDK-WebComponents":
+        break;
+    }
+    
   }
   
 };
@@ -117,18 +135,42 @@ export const renameComponent = async (
 
 
   let pegaConfig = await getPegaConfig();
+ 
+  let originalComponentKey = componentKey;
+  let associatedComponentKey = componentKey;
+
+  const framework = await getFramework();
+
+  let newComponentKey = `${organization}_${library}_${componentName}`;
+  let newCustomComponentKey = newComponentKey;
+  let newComponentKeyAssociated = newComponentKey;
+
+  switch (framework) {
+    case "SDK-Angular":
+      // componentKey is in Pascal case, which is associated, need to convert to Kabab case
+      let arComp = componentKey.split("/");
+      arComp[1] = convertIntoKebabCase(convertIntoPascalCase(arComp[1]));
+      componentKey = arComp.join("/");
+
+      newCustomComponentKey = convertIntoKebabCase(convertIntoPascalCase(newCustomComponentKey));
+      break;
+    case "SDK-React":
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
+
 
-  const newComponentKey = `${organization}_${library}_${componentName}`;
-  const typeLC = componentKey.split("/")[0];
-  const oldComponentKey = componentKey.split("/")[1];
+  const typeLC = originalComponentKey.split("/")[0];
+  const oldComponentKey = originalComponentKey.split("/")[1];
   const newComponentKeyPC = convertIntoPascalCase(newComponentKey);
   const oldComponentKeyPC = convertIntoPascalCase(oldComponentKey);
 
   const currentDirectory = await getComponentDirectoryPath(componentKey);
-  const currentDirectoryConstellation = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
+  const currentDirectoryConstellation = await getComponentDirectoryPath(associatedComponentKey, CATEGORY_CONSTELLATION);
 
-  const targetDirectory = await getComponentDirectoryPath(join(typeLC, "/",newComponentKey));
-  const targetDirectoryConstellation = await getComponentDirectoryPath(join(typeLC, "/",newComponentKey), CATEGORY_CONSTELLATION);
+  const targetDirectory = await getComponentDirectoryPath(join(typeLC, "/",newCustomComponentKey));
+  const targetDirectoryConstellation = await getComponentDirectoryPath(join(typeLC, "/",newComponentKeyAssociated), CATEGORY_CONSTELLATION);
 
   
 
@@ -166,7 +208,8 @@ export const renameComponent = async (
           fileName, 
           oldComponentKeyPC, 
           newComponentKeyPC, 
-          targetDirectory );
+          targetDirectory, 
+          framework );
 
     }
 
@@ -226,108 +269,22 @@ export default async options => {
   let componentDefaults = await getComponentDefaults();
   componentDefaults.library = library;
 
-  const localComponents = await getComponentsObj(true, CATEGORY_CUSTOM);
-
-
-  const questions = [
-    {
-      name: 'componentKey',
-      type: 'rawlist',
-      pageSize: 15,
-      message: 'Select component to rename',
-      choices: localComponents
-    },
-    {
-      name: 'componentName',
-      message: 'Enter new component name (required, no spaces)',
-      validate: value => {
-        /* value should not be empty
-        It should not have spaces
-        It should not start with a number
-        Only case-insensitive alphanumeric values are allowed
-      */
-        if (value && !/^\d/.test(value) && value === sanitize(value)) {
-          return true;
-        }
-        return 'Only alphanumeric values are allowed, starting with alphabets';
-      }
-    },
-    {
-      name: 'componentLabel',
-      message: 'Enter new component label for display (required)',
-      validate: value => {
-        if (value) {
-          return true;
-        }
-        return 'Please provide value for label';
-      }
-    },
-    {
-      name: 'organization',
-      message: 'Enter new component organization',
-      default: componentDefaults.organization,
-      validate: value => {
-        if (value) {
-          return true;
-        }
-        return 'Please provide value for organization';
-      }
-    },
-    {
-      name: 'version',
-      message: 'Enter new component version',
-      default: componentDefaults.version,
-      validate: value => {
-        if (validateSemver(value)) {
-          return true;
-        }
-        return 'Please provide semver compatible version e.g 0.0.1';
-      }
-    },
-    {
-      name: 'library',
-      message: 'Enter new library name (required)',
-      default: componentDefaults.library,
-      validate: value => {
-        /* value should not be empty
-          It should not have spaces
-          It should not start with a number
-          Only case-insensitive alphanumeric values are allowed
-        */
-        if (value && !/^\d/.test(value) && value === sanitize(value)) {
-          return true;
-        }
-        return 'Only alphanumeric values are allowed, starting with alphabets';
-      }
-    },
-    {
-      name: 'allowedApplications',
-      message: 'Please enter the application names to be supported (comma-separated). ',
-      suffix: 'Keep empty for all applications'
-    },
-    {
-      name: 'description',
-      message: 'Enter new description for the component (defaults to new label)',
-      default: componentDefaults.description,
-      /* if left blank and no defaults, mustache will use componentLabel, because description is used in app studio and
-      shouldn't be blank */
-    }
-  ];
-
-  await inquirer.prompt(questions).then(async answers => {
-    const {
-      componentKey,
-      componentName,
-      componentLabel,
-      organization,
-      library,
-      version,
-      description,
-      allowedApplications
-    } = answers;
+  // since custom has differnet naming convention for Angular, will get "constellation", which has the same name
+  // regardless of framework
+  const localComponents = await getComponentsObj(true);
+
+  if (options.params.length >= 11) {
+    const componentKey = options.params[3];
+    const componentName = options.params[4];
+    const componentLabel = options.params[5];
+    const organization = options.params[6];
+    const version = options.params[7];
+    const library = options.params[8];
+    const allowedApplications = options.params[9];
+    const description = options.params[10];
 
     await renameComponent(
-      { 
+      {
         componentKey,
         componentName,
         componentLabel,
@@ -339,7 +296,123 @@ export default async options => {
       },
       options
     );
-    
-  });
+
+  }
+  else {
+    const questions = [
+      {
+        name: 'componentKey',
+        type: 'rawlist',
+        pageSize: 15,
+        message: 'Select component to rename',
+        choices: localComponents
+      },
+      {
+        name: 'componentName',
+        message: 'Enter new component name (required, no spaces)',
+        validate: value => {
+          /* value should not be empty
+          It should not have spaces
+          It should not start with a number
+          Only case-insensitive alphanumeric values are allowed
+        */
+          if (value && !/^\d/.test(value) && value === sanitize(value)) {
+            return true;
+          }
+          return 'Only alphanumeric values are allowed, starting with alphabets';
+        }
+      },
+      {
+        name: 'componentLabel',
+        message: 'Enter new component label for display (required)',
+        validate: value => {
+          if (value) {
+            return true;
+          }
+          return 'Please provide value for label';
+        }
+      },
+      {
+        name: 'organization',
+        message: 'Enter new component organization',
+        default: componentDefaults.organization,
+        validate: value => {
+          if (value) {
+            return true;
+          }
+          return 'Please provide value for organization';
+        }
+      },
+      {
+        name: 'version',
+        message: 'Enter new component version',
+        default: componentDefaults.version,
+        validate: value => {
+          if (validateSemver(value)) {
+            return true;
+          }
+          return 'Please provide semver compatible version e.g 0.0.1';
+        }
+      },
+      {
+        name: 'library',
+        message: 'Enter new library name (required)',
+        default: componentDefaults.library,
+        validate: value => {
+          /* value should not be empty
+            It should not have spaces
+            It should not start with a number
+            Only case-insensitive alphanumeric values are allowed
+          */
+          if (value && !/^\d/.test(value) && value === sanitize(value)) {
+            return true;
+          }
+          return 'Only alphanumeric values are allowed, starting with alphabets';
+        }
+      },
+      {
+        name: 'allowedApplications',
+        message: 'Please enter the application names to be supported (comma-separated). ',
+        suffix: 'Keep empty for all applications'
+      },
+      {
+        name: 'description',
+        message: 'Enter new description for the component (defaults to new label)',
+        default: componentDefaults.description,
+        /* if left blank and no defaults, mustache will use componentLabel, because description is used in app studio and
+        shouldn't be blank */
+      }
+    ];
+  
+    await inquirer.prompt(questions).then(async answers => {
+      const {
+        componentKey,
+        componentName,
+        componentLabel,
+        organization,
+        library,
+        version,
+        description,
+        allowedApplications
+      } = answers;
+  
+      await renameComponent(
+        { 
+          componentKey,
+          componentName,
+          componentLabel,
+          library,
+          version,
+          description,
+          allowedApplications,
+          organization
+        },
+        options
+      );
+      
+    });
+  }
+
+  
   
 };