@pega/dx-component-builder-sdk 8.23.16 → 8.23.18

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

@@ -8,11 +8,15 @@ import ncp from 'ncp';
 import chalk from 'chalk';
 import { updateComponentMap  } from '../map/map.js';
 
-import { checkPathAccess, showVersion, getPegaConfig } from '../../util.js';
 import {
+  checkPathAccess, 
+  showVersion, 
+  getFramework,
+  getPegaConfig,
   getComponentDirectoryPath,
   getComponents,
-  getComponentDefaults
+  getComponentDefaults,
+  convertIntoKebabCase
 } from '../../util.js';
 
 import { COMPONENT_SCHEMA, 
@@ -22,7 +26,8 @@ import { COMPONENT_SCHEMA,
   DXCB_COMPONENT_DEFAULTS,
   CUSTOM_TEMPLATES,
   OVERRIDE_TEMPLATE_PATH,
-  OVERRIDE_REACT_LIB_PATH } from '../../constants.js';
+  OVERRIDE_REACT_LIB_PATH,
+  OVERRIDE_ANGULAR_LIB_PATH } from '../../constants.js';
 import { compileMustacheTemplates } from '@pega/dx-component-builder-sdk/src/tasks/create/index.js';
 
 const pegaConfigJsonPath = path.join(path.resolve(), SDK_CONFIG_JSON_FILENAME);
@@ -77,7 +82,19 @@ const checkAndCreateConfigComponentKey = async (targetDirectory) => {
 
 const getListAvailableComponents = async (type) => {
   const components = await getComponents(false, CATEGORY_OVERRIDE);
-  const fullList = COMPONENT_SCHEMA.overrideComponent[type];
+  let fullList;
+  const framework = await getFramework();
+  switch (framework) {
+    case "SDK-Angular":
+      fullList = COMPONENT_SCHEMA.overrideAngularComponent[type];
+      break;
+    case "SDK-React":
+      fullList = COMPONENT_SCHEMA.overrideReactComponent[type];
+      break;
+    case "SDK-WebComponents":
+      fullList = COMPONENT_SCHEMA.overrideWCComponent[type];
+      break;
+  }
   let availList = [];
   for (var el in fullList) {
 
@@ -100,10 +117,20 @@ const getListAvailableComponents = async (type) => {
   return availList;
 }
 
+const adjustAngularComponentName = (componentName) => {
+  if (componentName.indexOf("/") >= 0) {
+    componentName = componentName.split("/")[1];
+  }
+
+ 
+
+  return componentName;
+}
+
 
 const validateCompile = async (
   {
-    componentName,
+    componentName, 
     type
   },
   options
@@ -113,7 +140,28 @@ const validateCompile = async (
   await getPegaConfig();
 
   // will need to put a case statement here checking framework
-  let templateParentDir = OVERRIDE_REACT_LIB_PATH;
+  const framework = await getFramework();
+  let templateParentDir = "";
+
+  let originalComponentName = componentName;
+
+  switch (framework) {
+    case "SDK-Angular":
+      templateParentDir = OVERRIDE_ANGULAR_LIB_PATH;
+      componentName = adjustAngularComponentName(componentName);
+      componentName = convertIntoKebabCase(componentName);
+      break;
+    case "SDK-React":
+      templateParentDir = OVERRIDE_REACT_LIB_PATH;
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
+
+  if (componentName === "") {
+    console.log(chalk.red(`${originalComponentName} component doesn't exist`));
+    return;
+  }
 
   if (pegaConfig[DXCB_CONFIG] &&
     pegaConfig[DXCB_CONFIG][CUSTOM_TEMPLATES] &&

package/src/tasks/publish/helper.js

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import https from 'https';
 
 import fetch from 'node-fetch';
 import AdmZip from 'adm-zip';
@@ -12,7 +11,10 @@ import {
   getComponentsObj,
   getPegaServerConfig,
   validateRulesetVersion,
-  getOptionsCategory
+  getOptionsCategory,
+  getLocalComponentKeyFromConfig,
+  getFramework,
+  getHttpsAgent
 } from '../../util.js';
 
 import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
@@ -24,8 +26,26 @@ import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
 
 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' });
 
@@ -150,11 +170,13 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
         throw err;
       }
     });
-    fs.rmdir('lib', { recursive: true }, err => {
-      if (err) {
-        throw err;
-      }
-    });
+    if (fs.existsSync('lib')) {
+      fs.rm('lib', { recursive: true }, err => {
+        if (err) {
+          throw err;
+        }
+      });
+    }
   }
   else {
     if (fs.existsSync(configExtJson)) {
@@ -185,7 +207,7 @@ export const zipComponent = async (componentKey, category = CATEGORY_CUSTOM) =>
   return { zipContent, configContent };
 };
 
-export const publishComponentToServer = async data => {
+export const publishComponentToServer = async (data, doFetch = true) => {
   const { configContent, zipContent, rulesetName, rulesetVersion } = data;
   let { componentKey } = data;
 
@@ -216,55 +238,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 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}`);
-          }
+
+  // will be false for functional 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: getHttpsAgent(defaultPegaConfig),
+          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`);
   }
+ 
 };

package/src/tasks/publish/index.js

@@ -3,8 +3,8 @@ 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, bundleAssociatedComponent} from '../bundle/index.js';
 import { updateComponentMap  } from '../map/map.js';
 import { lintComponent } from '../linter/index.js';
 import { CATEGORY_CONSTELLATION, CATEGORY_CUSTOM } from '../../constants.js';
@@ -21,23 +21,62 @@ import { getPublishComponentQuestions,
 export default async options => {
   showVersion();
 
-  const catQuestion = await getBuildCategory(options);
-  const catAnswers = await inquirer.prompt(catQuestion);
+  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);
+    }
 
-  let category = catAnswers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
-  }
+    const questions = await getPublishComponentQuestions(category);
+    const answers = await inquirer.prompt(questions);
+    ({ componentKey, sourceMap, devBuild } = answers);
 
-  const questions = await getPublishComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const { componentKey, sourceMap, devBuild } = answers;
+    content = {
+      ...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(
     [
@@ -49,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}`);
@@ -57,9 +96,16 @@ export default async options => {
         }
       },
       {
-        title: `Bundle component ${sDevBuild}`,
-        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',
@@ -70,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);
         }
@@ -83,26 +129,26 @@ export default async options => {
       },
       {
         title: `Bundle associated component ${sDevBuild}`,
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
+        task: async () => await bundleAssociatedComponent(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);
         }
       }
     ],
@@ -120,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}`);
@@ -128,9 +174,14 @@ export default async options => {
         }
       },
       {
-        title: `Bundle component ${sDevBuild}`,
-        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',
@@ -141,14 +192,14 @@ 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 };
         }
       },
       {
         title: 'Publish component config',
         task: async () => {
-          await publishComponentToServer(content);
+          await publishComponentToServer(content, doFetch);
         }
       }
 

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

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import https from 'https';
 
 import fetch from 'node-fetch';
 import AdmZip from 'adm-zip';
@@ -12,7 +11,10 @@ import {
   getComponentsObj,
   validateRulesetVersion,
   getPegaServerConfig,
-  getOptionsCategory
+  getOptionsCategory,
+  getLocalComponentKeyFromConfig,
+  getFramework,
+  getHttpsAgent
 } from '../../util.js';
 
 import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
@@ -24,8 +26,25 @@ import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
 
 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' });
 
@@ -163,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;
 
@@ -207,55 +231,54 @@ 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) {
+
+  // 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;
+        const response = await fetch(url, {
+          method: 'POST',
+          agent: getHttpsAgent(defaultPegaConfig),
+          headers: {
+            Authorization: `${tokenType} ${accessToken}`
+          },
+          body: JSON.stringify(apiBody)
+        });
+
+        if (!response.ok) {
+          if (response.status === 408) {
             throw new Error(
-              'Error occurred in authentication. Please regenerate using authenticate'
+              'Time out'
             );
-            // 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.'
-              )}`
+          if (response.status === 401) {
+            throw new Error(
+              'Error occurred in authentication. Please regenerate using authenticate'
             );
           }
-          else {
-            throw new Error(`${respData.message}`);
+          if (response.status === 403) {
+            throw new Error(
+              'Error forbidden: User does not have privileges to Publish.'
+            );
           }
-        })
-        .catch(e => Promise.reject(`${chalk.bold.red(e)}`));
-    } else {
+
+        }
+
+        const data = await response.json();
+
+      } 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`);
   }
+
 };