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

package/src/tasks/publish/index.js

@@ -3,39 +3,80 @@ import Listr from 'listr';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
-import { getComponentDirectoryPath, showVersion, getOptionsCategory } from '../../util.js';
-import bundleComponent from '../bundle/index.js';
+import { getComponentDirectoryPath, showVersion, getOptionsCategory, 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, 
-  mapConfigJsonToCompanion, 
+import { getPublishComponentQuestions,
+  publishComponentToServer,
+  zipComponent,
+  getBuildCategory,
+  mapConfigJsonToCompanion,
   removeCompanionConfigJson} from './helper.js';
 
 
 export default async options => {
   showVersion();
 
-  const catQuestion = await getBuildCategory(options);
-  const catAnswers = await inquirer.prompt(catQuestion);
-
-  let category = catAnswers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
+  const framework = await getFramework();
+  
+  let componentKey;
+  let sourceMap;
+  let devBuild;
+  let content;
+  let category;
+
+  let doFetch = true;
+
+  if (options.params.length >= 8) {
+    category = options.params[3];
+    componentKey = options.params[4];
+    const rulesetName = options.params[5];
+    const rulesetVersion = options.params[6];
+    const dBuild = options.params[7];
+    devBuild = dBuild === 'Y' || dBuild === 'y' || dBuild === true || dBuild === 'true';
+    doFetch = false;
+
+    content = { componentKey, rulesetName, rulesetVersion, devBuild };
+  } else {
+    const catQuestion = await getBuildCategory(options);
+    const catAnswers = await inquirer.prompt(catQuestion);
+  
+    category = catAnswers.category;
+    if (category == null) {
+      category = getOptionsCategory(options);
+    }
+  
+    const questions = await getPublishComponentQuestions(category);
+    const answers = await inquirer.prompt(questions);
+    ({ componentKey, sourceMap, devBuild } = answers);
+  
+    content = {
+      ...answers
+    };
   }
 
-  const questions = await getPublishComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const { componentKey, sourceMap, devBuild } = answers;
 
-  let content = {
-    ...answers
-  };
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
+
+  let associatedComponentKey = componentKey;
+
+  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;
+  }
 
   const customTasks = new Listr(
     [
@@ -47,7 +88,7 @@ export default async options => {
         }
       },
       {
-        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}`);
@@ -55,9 +96,16 @@ export default async options => {
         }
       },
       {
-        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',
@@ -68,7 +116,7 @@ export default async options => {
       {
         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);
         }
@@ -80,27 +128,27 @@ export default async options => {
         }
       },
       {
-        title: 'Bundle associated component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
+        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);
+          const output = await zipComponent(associatedComponentKey, CATEGORY_CONSTELLATION);
           content = { ...content, ...output };
         }
       },
       {
         title: 'Publish associated component',
         task: async () => {
-          await publishComponentToServer(content);
+          await publishComponentToServer(content, doFetch);
         }
       },
       {
         title: 'Clean up associated',
         task: async () => {
-          await removeCompanionConfigJson(componentKey);
+          await removeCompanionConfigJson(associatedComponentKey);
         }
       }
     ],
@@ -118,7 +166,7 @@ export default async options => {
         }
       },
       {
-        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}`);
@@ -126,9 +174,14 @@ export default async options => {
         }
       },
       {
-        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),
+        enabled: ok => framework === "SDK-React"
+      },
+      {
+        title: `Bundle Angular component ${sDevBuild}`,
+        task: async () => await bundleAngularComponent(componentKey, sourceMap, devBuild, category),
+        enabled: ok => framework === "SDK-Angular"
       },
       {
         title: 'Update component map',
@@ -139,7 +192,7 @@ export default async options => {
       {
         title: 'Zip component config',
         task: async () => {
-          const output = await zipComponent(componentKey, category);
+          const output = await zipComponent(associatedComponentKey, category);
           content = { ...content, ...output };
         }
       },

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

@@ -12,20 +12,39 @@ import {
   getComponentsObj,
   validateRulesetVersion,
   getPegaServerConfig,
-  getOptionsCategory
+  getOptionsCategory,
+  getLocalComponentKeyFromConfig,
+  getFramework
 } from '../../util.js';
 
-import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, 
-  TOKEN_PATH, 
-  COMPONENT_SCHEMA, 
-  CATEGORY_CONSTELLATION, 
+import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH,
+  COMPONENT_SCHEMA,
+  CATEGORY_CONSTELLATION,
   CATEGORY_CUSTOM } from '../../constants.js';
 
 
 export const mapConfigJsonToCompanion = async ( componentKey ) => {
   const srcDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CUSTOM);
-  const companionDirectory = await getComponentDirectoryPath(componentKey, CATEGORY_CONSTELLATION);
   let configContent = fs.readFileSync(`${srcDirectory}/config.json`, { encoding: 'utf8' });
+  const framework = await getFramework();
+
+  let associatedComponentKey = componentKey;
+
+  switch (framework) {
+    case "SDK-Angular":
+      let arComp = associatedComponentKey.split("/");
+      const componentKeyPascal = await getLocalComponentKeyFromConfig(associatedComponentKey);
+      arComp[1] = componentKeyPascal;
+      associatedComponentKey = arComp.join("/")
+      break;
+    case "SDK-React":
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
+
+  const companionDirectory = await getComponentDirectoryPath(associatedComponentKey, CATEGORY_CONSTELLATION);
 
   fs.writeFileSync(`${companionDirectory}/config.json`, configContent, { encoding: 'utf8' });
 
@@ -54,8 +73,8 @@ export const getBuildCategory = async (options) => {
   ];
 };
 
-export const getPublishComponentQuestions = async () => {
-  const components = await getComponentsObj();
+export const getPublishComponentQuestions = async (category) => {
+
   const defaultPegaConfig = await getPegaServerConfig();
 
   return [
@@ -89,6 +108,7 @@ export const getPublishComponentQuestions = async () => {
     },
     {
       name: 'devBuild',
+      type: 'confirm',
       message: 'Generate development build ?',
       default: defaultPegaConfig.devBuild
     }
@@ -162,20 +182,25 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
 };
 
 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;
-    }
-  });
+  if (fs.existsSync('dist/components')) {
+    fs.rm('dist/components', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
+
+  if (fs.existsSync('lib')) {
+    fs.rm('lib', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
 }
 
-export const publishComponentToServer = async data => {
+export const publishComponentToServer = async (data, doFetch = true) => {
   const { configContent, zipContent, rulesetName, rulesetVersion } = data;
   let { componentKey } = data;
 
@@ -206,46 +231,60 @@ export const publishComponentToServer = async data => {
     defaultPegaConfig.server,
     PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
   );
-  try {
-    const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
-    if (OauthData) {
-      const {
-        access_token: accessToken,
-        token_type: tokenType,
-        refresh_token: refreshToken
-      } = JSON.parse(OauthData);
-      let status = 500;
-      fetch(url, {
-        method: 'POST',
-        agent: new https.Agent({ rejectUnauthorized: false }),
-        headers: {
-          Authorization: `${tokenType} ${accessToken}`
-        },
-        body: JSON.stringify(apiBody)
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(resp => {
-          const respData = JSON.parse(resp);
-          if (status === 401) {
-            throw new Error(
-              'Error occurred in authentication. Please regenerate using authenticate'
-            );
-            // console.log(accessTokenUri, refreshToken);
-            /* TODO - Handle refresh_token */
-          } else if (status == 200) {
-            console.log(chalk.bold.green(`Success : ${respData.message}`));
-          } else {
-            throw new Error(`${respData.message}`);
-          }
+
+  // fetch if not testing
+  if (doFetch) {
+    try {
+      const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+      if (OauthData) {
+        const {
+          access_token: accessToken,
+          token_type: tokenType,
+          refresh_token: refreshToken
+        } = JSON.parse(OauthData);
+        let status = 500;
+        fetch(url, {
+          method: 'POST',
+          agent: new https.Agent({ rejectUnauthorized: false }),
+          headers: {
+            Authorization: `${tokenType} ${accessToken}`
+          },
+          body: JSON.stringify(apiBody)
         })
-        .catch(e => Promise.reject(`${chalk.bold.red(e)}`));
-    } else {
+          .then(response => {
+            status = response.status;
+            return response.text();
+          })
+          .then(resp => {
+            const respData = JSON.parse(resp);
+            if (status === 401) {
+              throw new Error(
+                'Error occurred in authentication. Please regenerate using authenticate'
+              );
+              // console.log(accessTokenUri, refreshToken);
+              /* TODO - Handle refresh_token */
+            } else if (status == 200) {
+              console.log(chalk.bold.green(`Success : ${respData.message}`));
+            }
+            else if (status === 403) {
+              // eslint-disable-next-line prefer-promise-reject-errors
+              Promise.reject(
+                `${chalk.bold.red(
+                  'Error forbidden: User does not have privileges to Publish.'
+                )}`
+              );
+            }
+            else {
+              throw new Error(`${respData.message}`);
+            }
+          })
+          .catch(e => Promise.reject(`${chalk.bold.red(e)}`));
+      } else {
+        throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      }
+    } catch (err) {
       throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
     }
-  } catch (err) {
-    throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
   }
+
 };