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

package/src/tasks/authenticate/index.js

@@ -17,7 +17,7 @@ let server = null;
 const generateAccessToken = async config => {
 
   let authSuccess = false;
-  const { serverType, authService, isolationId, grantType, clientId, clientSecret, user, password } = config;
+  const { serverType, authService, isolationId, grantType, clientId, clientSecret, user, password, legacyTLS } = config;
   // Try to gracefully deal with missing trailing slashes for server (and later conditionally for redirectUri)
   const server = config.server.endsWith('/') ? config.server : `${config.server}/`;
 
@@ -67,6 +67,7 @@ const generateAccessToken = async config => {
       clientId: clientId,
       clientSecret: clientSecret,
       ignoreInvalidCerts: true,
+      useNodeFetch:true,
       ...authCodeConfig
     };
     if (serverType === 'infinity') {
@@ -75,9 +76,12 @@ const generateAccessToken = async config => {
         authConfig.password = Buffer.from(password).toString('base64');
       }
     }
+    if (legacyTLS) {
+      authConfig.legacyTLS = true;
+    }
     if (serverType === 'launchpad') {
       authConfig.isolationId = isolationId;
-      // authConfig.noPKCE = true;
+      authConfig.noPKCE = true;
     }
 
     try {
@@ -148,6 +152,9 @@ export default async options => {
   serverConfig.server = data[SERVER_CONFIG][serverConfig.serverType === "infinity" ? SERVER_REST_URL : LP_SERVER_REST_URL];
   serverConfig.authService = data.authConfig?.authService || 'pega';
   const isPwdNonEmpty = serverConfig['password'] ? true : false;
+  if( data[SERVER_CONFIG]['legacyTLS'] ) {
+    serverConfig.legacyTLS = true;
+  }
 
   const questions = await getAuthQuestions(serverConfig);
   const answers = await inquirer.prompt(questions);
@@ -179,6 +186,9 @@ export default async options => {
 
   delete serverConfig.serverType;
   delete serverConfig.server;
+  if( serverConfig.legacyTLS ) {
+    delete serverConfig.legacyTLS;
+  }
 
   if (authOK & bWriteUpdate) {
     // Don't write password value (unless it already had a value)

package/src/tasks/build/helper.js

@@ -25,11 +25,14 @@ export const cleanUp = async () => {
     }
   });
 
-  fs.rm('lib', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  if (fs.existsSync('lib')) {
+    fs.rm('lib', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
+
 }
 
 export const getBuildCategory = async (options) => {
@@ -53,7 +56,7 @@ export const getBuildComponentQuestions = async (category) => {
   const defaultPegaConfig = await getPegaServerConfig();
 
   if (components.length == 0) {
-    console.log(chalk.bold.yellow(`No components to build`));
+    console.log(chalk.redBright("No components to build"));
     process.exit(1);
   }
 
@@ -73,6 +76,7 @@ export const getBuildComponentQuestions = async (category) => {
     },
     {
       name: 'devBuild',
+      type: 'confirm',
       message: 'Generate development build ?',
       default: defaultPegaConfig.devBuild
     }

package/src/tasks/build/index.js

@@ -4,31 +4,73 @@ import chalk from 'chalk';
 
 import validate from '../validator/index.js';
 
-import bundleComponent from '../bundle/index.js';
+import { bundleReactComponent, bundleAngularComponent, bundleAssociatedComponent} from '../bundle/index.js';
 import lintComponent from '../linter/index.js';
 import { getBuildComponentQuestions, getBuildCategory, cleanUp } from './helper.js';
-import { getComponentDirectoryPath, showVersion, getOptionsCategory } from '../../util.js';
+import { getComponentDirectoryPath, showVersion, getOptionsCategory, getFramework, getLocalComponentKeyFromConfig, convertIntoKebabCase, convertIntoPascalCase } from '../../util.js';
 
 import { CATEGORY_CUSTOM } from '../../constants.js';
 
+
 export default async options => {
   showVersion();
 
-  const catQuestion = await getBuildCategory(options);
-  const catAnswers = await inquirer.prompt(catQuestion);
+  const framework = await getFramework();
+
+  let category;
+  let componentKey;
+  let sourceMap;
+  let devBuild;
+  let content;
+
+  if (options.params.length >= 7) {
+    category = options.params[3]
+    componentKey = options.params[4];
+    sourceMap = options.params[5];
+    const dBuild = options.params[6];
+    devBuild = (dBuild === 'Y' ||
+    dBuild === 'y' ||
+    dBuild === true ||
+    dBuild === 'true') ? true : false;
 
-  let category = catAnswers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
+    content = { componentKey, sourceMap, devBuild};
   }
+  else {
+    const catQuestion = await getBuildCategory(options);
+    const catAnswers = await inquirer.prompt(catQuestion);
 
-  const questions = await getBuildComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const { componentKey, sourceMap, devBuild } = answers;
+    category = catAnswers.category;
+    if (category == null) {
+      category = getOptionsCategory(options);
+    }
+
+    const questions = await getBuildComponentQuestions(category);
+    const answers = await inquirer.prompt(questions);
+    ({ componentKey, sourceMap, devBuild } = answers);
+
+    content = {
+      ...answers
+    };
+
+  }
+
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
+
+  let associatedComponentKey = componentKey;
+
+  switch (framework) {
+    case "SDK-Angular":
+      let arComp = componentKey.split("/");
+      arComp[1] = convertIntoKebabCase(convertIntoPascalCase(arComp[1]));
+      componentKey = arComp.join("/")
+      break;
+    case "SDK-React":
+      break;
+    case "SDK-WebComponents":
+      break;
+  }
 
-  let content = {
-    ...answers
-  };
 
   const customTasks = new Listr(
     [
@@ -39,7 +81,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}`);
@@ -47,20 +89,26 @@ export default async options => {
         }
       },
       {
-        title: 'Bundle component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
+        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: 'Lint associated component',
         task: async () => {
-          const targetDirectory = await getComponentDirectoryPath(componentKey, "constellation");
+          const targetDirectory = await getComponentDirectoryPath(associatedComponentKey, "constellation");
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
           await lintComponent(targetDirectory);
         }
       },
       {
-        title: 'Bundle associated component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, "constellation")
+        title: `Bundle associated component ${sDevBuild}`,
+        task: async () => await bundleAssociatedComponent(associatedComponentKey, sourceMap, devBuild, "constellation")
       }
     ],
     {
@@ -77,7 +125,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}`);
@@ -85,8 +133,14 @@ export default async options => {
         }
       },
       {
-        title: 'Bundle Component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
+        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"
       }
     ],
     {

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

@@ -13,17 +13,21 @@ import {
 import { COMPONENT_SCHEMA, CATEGORY_CUSTOM } from '../../constants.js';
 
 export const cleanUp = async () => {
-  fs.rm('dist/components', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  if (fs.existsSync('dist/components')) {
+    fs.rm('dist/components', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
 
-  fs.rm('lib', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  if (fs.existsSync('lib')) {
+    fs.rm('lib', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
 }
 
 export const getBuildCategory = async (options) => {
@@ -47,13 +51,14 @@ export const getBuildComponentQuestions = async (category) => {
   const defaultPegaConfig = await getPegaServerConfig();
 
   if (components.length == 0) {
-    console.log(chalk.bold.yellow(`No components to build`));
+    console.log(chalk.redBright("No components to build"));
     process.exit(1);
   }
 
   return [
     {
       name: 'devBuild',
+      type: 'confirm',
       message: 'Generate development build ?',
       default: defaultPegaConfig.devBuild
     }

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

@@ -4,16 +4,22 @@ import chalk from 'chalk';
 
 import validate from '../validator/index.js';
 
-import bundleComponent from '../bundle/index.js';
+import { bundleReactComponent, bundleAngularComponent, bundleAssociatedComponent} from '../bundle/index.js';
 import lintComponent from '../linter/index.js';
 import { getBuildComponentQuestions, getBuildCategory, cleanUp } from './helper.js';
-import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj } from '../../util.js';
+import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj, getFramework, getLocalComponentKeyFromConfig, convertIntoKebabCase, convertIntoPascalCase } from '../../util.js';
 
 import { CATEGORY_CUSTOM } from '../../constants.js';
 
-export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options) {
 
-  const customTasks = new Listr(
+
+export function getCustomTasks(componentKey, category, sourceMap, devBuild, content, options, associatedComponentKey, framework) {
+
+
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
+
+  return new Listr(
     [
       {
         title: 'Validate config schema',
@@ -22,7 +28,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}`);
@@ -30,20 +36,26 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
         }
       },
       {
-        title: 'Bundle component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
+        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: 'Lint associated component',
         task: async () => {
-          const targetDirectory = await getComponentDirectoryPath(componentKey, "constellation");
+          const targetDirectory = await getComponentDirectoryPath(associatedComponentKey, "constellation");
           // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
           await lintComponent(targetDirectory);
         }
       },
       {
-        title: 'Bundle associated component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, "constellation")
+        title: `Bundle associated component ${sDevBuild}`,
+        task: async () => await bundleAssociatedComponent(associatedComponentKey, sourceMap, devBuild, "constellation")
       }
     ],
     {
@@ -51,13 +63,13 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
     }
   );
 
-  return customTasks;
 }
 
 
-export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options) {
-
-  const overrideTasks = new Listr(
+export function getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options, framework) {
+  const sDevBuild = devBuild ? '(dev build)' : '';
+  const sFramework = framework.split("-")[1];
+  return new Listr(
     [
       {
         title: 'Validate config schema',
@@ -66,7 +78,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}`);
@@ -74,8 +86,14 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
         }
       },
       {
-        title: 'Bundle Component',
-        task: async () => await bundleComponent(componentKey, sourceMap, devBuild, category),
+        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"
       }
     ],
     {
@@ -83,38 +101,83 @@ 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);
+  const framework = await getFramework();
 
-  let category = catAnswers.category;
-  if (category == null) {
-    category = getOptionsCategory(options);
-  }
+  let sourceMap;
+  let devBuild;
+  let category;
+  let content;
+  let components;
 
-  const components = await getComponentsObj(false, category);
-  const questions = await getBuildComponentQuestions(category);
-  const answers = await inquirer.prompt(questions);
-  const { sourceMap, devBuild } = answers;
+  if (options.params.length >= 5) {
+    category = options.params[3];
+    const dBuild = options.params[4];
+    devBuild = (dBuild === 'Y' ||
+    dBuild === 'y' ||
+    dBuild === true ||
+    dBuild === 'true') ? true : false;
+
+    content = { devBuild };
+    components = await getComponentsObj(false, category);
+  }
+  else {
+    const catQuestion = await getBuildCategory(options);
+    const catAnswers = await inquirer.prompt(catQuestion);
 
-  let content = {
-    ...answers
-  };
+    category = catAnswers.category;
+    if (category == null) {
+      category = getOptionsCategory(options);
+    }
 
-  var componentKey;
+    components = await getComponentsObj(false, category);
+    const questions = await getBuildComponentQuestions(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("Building: " + components[index].name));
+    for (const component of components) {
+      let componentKey = component.value;
+      const componentKeyName = component.name;
+      console.log(chalk.bold.green(`Building: ${componentKeyName}`));
+
+      let associatedComponentKey = componentKey;
+
+      switch (framework) {
+        case "SDK-Angular":
+          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);
+      // 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;
+      // }
+
+      let myCustomTasks = getCustomTasks(componentKey, category, sourceMap, devBuild, content, options, associatedComponentKey, framework);
 
       await myCustomTasks.run().catch(err => {
          console.log(chalk.bold.red(err.toString()));
@@ -122,19 +185,20 @@ export default async options => {
     }
   }
   else {
-    for (var index in components) {
-      componentKey = components[index].value;
-      console.log(chalk.bold.green("Building: " + components[index].name));
+    for (const component of components) {
+      const componentKey = component.value;
+      const componentKeyName = component.name;
+      console.log(chalk.bold.green(`Building: ${componentKeyName}`));
 
-      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options);
+      let myOverrideTasks = getOverrideTasks(componentKey, category, sourceMap, devBuild, content, options, framework);
 
-      await mOverrideTasks.run().catch(err => {
+      await myOverrideTasks.run().catch(err => {
          console.log(chalk.bold.red(err.toString()));
       });
     }
   }
 
-  cleanUp();
+  await cleanUp();
 
   return true;
 };

package/src/tasks/bundle/{builder → builderAngular}/paths.js

@@ -36,6 +36,7 @@ const resolveModule = (resolveFn, filePath) => {
 };
 
 // config after eject: we're in ./config/
+// building a standard Angular component for Angular SDK, use same ts config as buid:dev
 export default {
   dotenv: resolveApp('.env'),
   appPath: resolveApp('.'),
@@ -43,8 +44,8 @@ export default {
   appPublic: resolveApp('public'),
   appIndexJs: resolveModule(resolveApp, 'src/index'),
   appPackageJson: resolveApp('package.json'),
-  appSrc: resolveApp('src'),
-  appTsConfig: resolveApp('tsconfig.json'),
+  appSrc: resolveApp('src/app/_components'),
+  appTsConfig: resolveApp('tsconfig.app.json'),
   appJsConfig: resolveApp('jsconfig.json'),
   appNodeModules: resolveApp('node_modules')
 };