@pega/custom-dx-components 23.1.10 → 23.1.12

package/src/tasks/publish/helper.js

@@ -13,7 +13,11 @@ import {
   validateRulesetVersion,
   getHttpsAgent
 } from '../../util.js';
-import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
+import {
+  PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH
+} from '../../constants.js';
 
 export const getPublishComponentQuestions = async () => {
   const components = await getComponents();
@@ -36,7 +40,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetName',
       message: 'Enter ruleset name',
       default: defaultPegaConfig.rulesetName,
-      validate: (value) => {
+      validate: value => {
         if (value.trim()) {
           return true;
         }
@@ -50,7 +54,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetVersion',
       message: 'Enter ruleset version',
       default: defaultPegaConfig.rulesetVersion,
-      validate: (value) => {
+      validate: value => {
         if (validateRulesetVersion(value)) {
           return true;
         }
@@ -76,7 +80,7 @@ export const getPublishComponentQuestions = async () => {
   ];
 };
 
-export const zipComponent = async (componentKey) => {
+export const zipComponent = async componentKey => {
   const srcDirectory = await getComponentDirectoryPath(componentKey);
   const buildDirectory = await path.join(path.resolve(), 'dist/components', componentKey);
   const configJson = `${srcDirectory}/config.json`;
@@ -90,7 +94,7 @@ export const zipComponent = async (componentKey) => {
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
 
-  fs.rmdir('dist', { recursive: true }, (err) => {
+  fs.rm('dist', { recursive: true }, err => {
     if (err) {
       throw err;
     }
@@ -105,7 +109,10 @@ export const publishComponentToServer = async (data, doFetch) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
   const { serverType, isolationId } = defaultPegaServerConfig;
   const isLaunchpad = serverType === 'launchpad';
-  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace('{isolationId}', isolationId);
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
+    '{isolationId}',
+    isolationId || 'undefined'
+  );
   let apiBody;
 
   if (isLaunchpad) {
@@ -129,7 +136,10 @@ export const publishComponentToServer = async (data, doFetch) => {
   }
 
   const defaultPegaConfig = await getPegaServerConfig();
-  const url = constructCompleteUrl(defaultPegaConfig.server, isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT);
+  const url = constructCompleteUrl(
+    defaultPegaConfig.server,
+    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
+  );
 
   if (doFetch) {
     try {
@@ -156,29 +166,39 @@ export const publishComponentToServer = async (data, doFetch) => {
           headers,
           body: JSON.stringify(apiBody)
         })
-          .then((response) => {
+          .then(response => {
             status = response.status;
             return response.text();
           })
-          .then((resp) => {
+          .then(resp => {
             const respData = isLaunchpad ? resp : JSON.parse(resp);
             if (status === 401) {
-              throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+              throw new Error(
+                'Error occurred in authentication. Please regenerate using authenticate'
+              );
               // console.log(accessTokenUri, refreshToken);
               /* TODO - Handle refresh_token */
             } else if (status === 200 || status === 201) {
-              console.log(chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`));
+              console.log(
+                chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`)
+              );
             } else {
               throw new Error(`${respData.message}`);
             }
           })
-          .catch((e) => {
+          .catch(e => {
             if (e.code === 'ECONNREFUSED') {
               // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red('Error occurred in authentication. Please regenerate using authenticate')}`);
+              Promise.reject(
+                `${chalk.bold.red(
+                  'Error occurred in authentication. Please regenerate using authenticate'
+                )}`
+              );
             } 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.')}`);
+              Promise.reject(
+                `${chalk.bold.red('Error forbidden: User does not have privileges to Publish.')}`
+              );
             } else {
               // eslint-disable-next-line prefer-promise-reject-errors
               Promise.reject(`${chalk.bold.red(e)}`);

package/src/tasks/publish/index.js

@@ -1,5 +1,5 @@
 import inquirer from 'inquirer';
-import Listr from 'listr';
+import { Listr } from 'listr2';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
@@ -9,7 +9,7 @@ import { getComponentDirectoryPath, showVersion } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 
-export default async (options) => {
+export default async options => {
   showVersion();
 
   let componentKey;
@@ -19,13 +19,15 @@ export default async (options) => {
 
   let doFetch = true;
 
-  if (options.params.length >= 8) {
+  if (options.params.length >= 7) {
     componentKey = 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';
-    doFetch = false;
+
+    // eslint-disable-next-line no-unneeded-ternary,no-nested-ternary
+    doFetch = options.params.length >= 7 ? (options.params[7] === 'noFetch' ? false : true) : true;
 
     content = { componentKey, rulesetName, rulesetVersion, devBuild };
   } else {
@@ -79,7 +81,7 @@ export default async (options) => {
     }
   );
 
-  await tasks.run().catch((err) => {
+  await tasks.run().catch(err => {
     console.log(chalk.bold.red(err.toString()));
   });
   return true;

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

@@ -5,8 +5,18 @@ import fetch from 'node-fetch';
 import AdmZip from 'adm-zip';
 import chalk from 'chalk';
 
-import { constructCompleteUrl, getComponentDirectoryPath, getPegaServerConfig, validateRulesetVersion, getHttpsAgent } from '../../util.js';
-import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
+import {
+  constructCompleteUrl,
+  getComponentDirectoryPath,
+  getPegaServerConfig,
+  validateRulesetVersion,
+  getHttpsAgent
+} from '../../util.js';
+import {
+  PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH
+} from '../../constants.js';
 
 export const getPublishComponentQuestions = async () => {
   const defaultPegaConfig = await getPegaServerConfig();
@@ -16,7 +26,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetName',
       message: 'Enter ruleset name',
       default: defaultPegaConfig.rulesetName,
-      validate: (value) => {
+      validate: value => {
         if (value.trim()) {
           return true;
         }
@@ -30,7 +40,7 @@ export const getPublishComponentQuestions = async () => {
       name: 'rulesetVersion',
       message: 'Enter ruleset version',
       default: defaultPegaConfig.rulesetVersion,
-      validate: (value) => {
+      validate: value => {
         if (validateRulesetVersion(value)) {
           return true;
         }
@@ -56,7 +66,7 @@ export const getPublishComponentQuestions = async () => {
   ];
 };
 
-export const zipComponent = async (componentKey) => {
+export const zipComponent = async componentKey => {
   const srcDirectory = await getComponentDirectoryPath(componentKey);
   const buildDirectory = await path.join(path.resolve(), 'dist/components', componentKey);
   const configJson = `${srcDirectory}/config.json`;
@@ -79,13 +89,13 @@ export const zipComponent = async (componentKey) => {
 };
 
 export const cleanUp = async () => {
-  fs.rm('dist/components', { recursive: true }, (err) => {
+  fs.rm('dist/components', { recursive: true }, err => {
     if (err) {
       throw err;
     }
   });
 
-  fs.rm('lib', { recursive: true }, (err) => {
+  fs.rm('lib', { recursive: true }, err => {
     if (err) {
       throw err;
     }
@@ -98,7 +108,10 @@ export const publishComponentToServer = async (data, doFetch) => {
   const defaultPegaServerConfig = await getPegaServerConfig();
   const { serverType, isolationId } = defaultPegaServerConfig;
   const isLaunchpad = serverType === 'launchpad';
-  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace('{isolationId}', isolationId);
+  const launchpadRestEndpoint = LP_PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT.replace(
+    '{isolationId}',
+    isolationId || 'undefined'
+  );
   let apiBody;
 
   if (isLaunchpad) {
@@ -122,7 +135,10 @@ export const publishComponentToServer = async (data, doFetch) => {
   }
 
   const defaultPegaConfig = await getPegaServerConfig();
-  const url = constructCompleteUrl(defaultPegaConfig.server, isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT);
+  const url = constructCompleteUrl(
+    defaultPegaConfig.server,
+    isLaunchpad ? launchpadRestEndpoint : PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT
+  );
 
   if (doFetch) {
     try {
@@ -143,45 +159,67 @@ export const publishComponentToServer = async (data, doFetch) => {
           headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
-          headers,
+          headers: headers,
           body: JSON.stringify(apiBody)
-        })
-          .then((response) => {
-            status = response.status;
-            return response.text();
-          })
-          .then((resp) => {
-            const respData = isLaunchpad ? resp : 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 || status === 201) {
-              console.log(chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`));
-            } else {
-              throw new Error(`${respData.message}`);
-            }
-          })
-          .catch((e) => {
-            if (e.code === 'ECONNREFUSED') {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red('Error occurred in authentication. Please regenerate using authenticate')}`);
-            } 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 {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red(e)}`);
-            }
-          });
+        });
+
+        status = response.status;
+        if (!response.ok) {
+          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 === 404){
+            throw new Error('404: Server resource not found');
+          }
+          else if (status === 405){
+            throw new Error('405: Server method not allowed');
+          }
+          else if (status === 408){
+            throw new Error('408: Server timed out');
+          }
+          else if (response.status === 403) {
+            throw new Error(
+              'Error forbidden: User does not have privileges to Publish.'
+            );
+          }
+        }
+
+        try {
+          const respData = isLaunchpad ? await response.text() : await response.json();
+          console.log(
+                chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`)
+          );
+
+          if (status === 500) {
+            status = 999;
+            throw new Error(respData.message);
+          }
+        }
+        catch (err) {
+          if (status === 500) {
+              throw new Error(
+               `Error occurred in authentication. Please regenerate using authenticate`
+              );
+          }
+          else if (status === 999) {
+            throw new Error (err);
+          }
+        }
+
       } 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`);
+      // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      throw new Error(err);
     }
   }
 };

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

@@ -1,5 +1,5 @@
 import inquirer from 'inquirer';
-import Listr from 'listr';
+import { Listr } from 'listr2';
 import chalk from 'chalk';
 
 import validate from '../validator/index.js';
@@ -7,12 +7,17 @@ import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
 import { getComponents, getComponentDirectoryPath, showVersion } from '../../util.js';
 
-import { getPublishComponentQuestions, publishComponentToServer, zipComponent, cleanUp } from './helper.js';
+import {
+  getPublishComponentQuestions,
+  publishComponentToServer,
+  zipComponent,
+  cleanUp
+} from './helper.js';
 
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
   const sDevBuild = devBuild ? '(dev build)' : '';
-  // eslint-disable-next-line no-unneeded-ternary
-  const doFetch = options.params.length >= 7 ? false : true;
+  // eslint-disable no-unneeded-ternary,no-nested-ternary
+  const doFetch = options.params.length >= 7 ? (options.params[6] === 'noFetch' ? false : true) : true;
   return new Listr(
     [
       {
@@ -21,13 +26,6 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await validate(componentKey);
         }
       },
-      {
-        title: `Bundle Component ${sDevBuild}`,
-        task: async () => {
-          await bundleComponent(componentKey, sourceMap, devBuild);
-        },
-        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
-      },
       {
         title: 'Lint component',
         task: async () => {
@@ -36,6 +34,13 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await lintComponent(targetDirectory);
         }
       },
+      {
+        title: `Bundle Component ${sDevBuild}`,
+        task: async () => {
+          await bundleComponent(componentKey, sourceMap, devBuild);
+        },
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
+      },
       {
         title: 'Zip Component',
         task: async () => {
@@ -50,13 +55,11 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
         }
       }
     ],
-    {
-      exitOnError: true
-    }
+    { concurrent: false, exitOnError: true }
   );
 }
 
-export default async (options) => {
+export default async options => {
   showVersion();
 
   const components = await getComponents();
@@ -71,7 +74,7 @@ export default async (options) => {
   let devBuild;
   let content;
 
-  if (options.params.length >= 7) {
+  if (options.params.length >= 6) {
     const rulesetName = options.params[3];
     const rulesetVersion = options.params[4];
     const dBuild = options.params[5];
@@ -89,15 +92,17 @@ export default async (options) => {
   }
 
   // eslint-disable-next-line no-shadow
-  for (const componentKey of components) {
+  for await (const componentKey of components) {
     console.log(chalk.bold.green(`Publishing: ${componentKey}`));
 
     const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
 
-    // eslint-disable-next-line no-await-in-loop
-    await myCustomTasks.run().catch((err) => {
+    try {
+      await myCustomTasks.run();
+    } catch (err) {
       console.log(chalk.bold.red(err.toString()));
-    });
+      process.exit(1);
+    }
   }
 
   // once done, remove leftover directories

package/src/tasks/revert-webpack/index.js

@@ -1,31 +1,30 @@
 
 import fs from 'fs';
-import path from 'path';
-import { join } from 'path';
+import path, { join } from 'path';
 import { URL, fileURLToPath } from 'url';
+
 import chalk from 'chalk';
+import { up } from 'inquirer/lib/utils/readline.js';
 
 import {
   convertIntoPascalCase,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
-
 import {
   WEBPACK_CONFIG_JS_FILENAME,
   BUILDER_INDEX_FILE_PATH
 } from '../../constants.js';
-import build from '@pega/custom-dx-components/src/tasks/build/index.js';
-import { up } from 'inquirer/lib/utils/readline.js';
 
 
 
 export const renamePromotedWebPack = async () => {
 
   // call this function from top level
-  //fs.copyFileSync("./webpack.config.js", "webpack.config.js")
+  // fs.copyFileSync("./webpack.config.js", "webpack.config.js")
 
   const promoteWebPackDir = path.resolve(WEBPACK_CONFIG_JS_FILENAME);
-  const renamedPromoteWebPackDir = path.resolve(WEBPACK_CONFIG_JS_FILENAME + ".notused");
+  const renamedPromoteWebPackDir = path.resolve(`${WEBPACK_CONFIG_JS_FILENAME  }.notused`);
 
   try {
     fs.renameSync(promoteWebPackDir, renamedPromoteWebPackDir);
@@ -35,37 +34,17 @@ export const renamePromotedWebPack = async () => {
     process.exit();
   }
 
+  console.log(chalk.bold.green("Bundler reverted to using internal webpack.config.js."));
   console.log(chalk.bold.green(`File ${promoteWebPackDir} marked as not used.`));
 
 }
 
-export const revertBuilder = async () => {
-
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
-
-  if (indexFileJS.length > 0) {
-    // uncomment out original webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from './webpack.config.js';", "import configFactory from './webpack.config.js';");
 
-    // comment out promoted webpack reference
-    if (indexFileJS.indexOf("// import configFactory from '../../../../../../../webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from '../../../../../../../webpack.config.js';", "// import configFactory from '../../../../../../../webpack.config.js';");
-    }
-
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
-
-    console.log(chalk.bold.green(`Bundler reverted to using internal webpack.config.js.`));
-  }
-
-
-}
 
 export default async options => {
   showVersion();
 
   await renamePromotedWebPack();
-  await revertBuilder();
+  await updateUseWebPackPromotion(false);
 
 };

package/src/tasks/upgrade/index.js

@@ -1,7 +1,7 @@
 import { promisify } from 'util';
 import { exec } from 'child_process';
 
-import Listr from 'listr';
+import { Listr } from 'listr2';
 
 const execPromise = promisify(exec);