@pega/custom-dx-components 26.1.11 → 26.1.12-alpha.0.2

package/src/tasks/list-pub/helper.js

@@ -7,7 +7,7 @@ import {
   getC11NB2STokenAndStaticServer,
   getApplicationAndVersionFromToken,
   constructCompleteUrl,
-  getFetchAgent
+  getFetchAgent,
 } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
@@ -15,10 +15,10 @@ import { LIST_COMPONENT_LIBRARIES_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../.
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
-  LOCAL: 'Local'
+  LOCAL: 'Local',
 };
 
-export const getListLibraryQuestions = async libraryName => {
+export const getListLibraryQuestions = async (libraryName) => {
   addDebugLog('getListLibraryQuestions', `libraryName: ${libraryName}`, '');
   const defaultPegaConfig = await getPegaServerConfig();
 
@@ -28,8 +28,8 @@ export const getListLibraryQuestions = async libraryName => {
       type: 'rawlist',
       message: `List library ${chalk.bold.green(`${libraryName}`)} from Server or Local ?`,
       choices: Object.values(SOURCE_OF_COMPONENT_TYPES),
-      default: defaultPegaConfig.sourceOfComponents
-    }
+      default: defaultPegaConfig.sourceOfComponents,
+    },
   ];
 };
 
@@ -40,8 +40,8 @@ export const getLibraryVersionQuestion = async (libraryName, libVersions) => {
       name: 'version',
       type: 'rawlist',
       message: `Select ${chalk.green.bold(`${libraryName}`)} library version (or ALL) to delete`,
-      choices: libVersions
-    }
+      choices: libVersions,
+    },
   ];
 };
 
@@ -55,8 +55,8 @@ export const getServerLocalQuestion = async () => {
       type: 'rawlist',
       message: `List from Server or Local ?`,
       choices: Object.values(SOURCE_OF_COMPONENT_TYPES),
-      default: 'defaultPegaConfig.sourceOfComponents'
-    }
+      default: 'defaultPegaConfig.sourceOfComponents',
+    },
   ];
 };
 
@@ -81,9 +81,9 @@ async function fetchComponentLibrariesFromInfinity(apiUrl, headers) {
     fetch(apiUrl, {
       method: 'GET',
       dispatcher: getFetchAgent(serverConfig),
-      headers
+      headers,
     })
-      .then(response => {
+      .then((response) => {
         status = response.status;
         if (status === 401) {
           throw new Error('Error occurred in authentication. Please regenerate using authenticate');
@@ -94,9 +94,16 @@ async function fetchComponentLibrariesFromInfinity(apiUrl, headers) {
         } else if (status === 408) {
           throw new Error('408: Server timed out');
         }
-        return response.json();
+        return response.text().then((text) => {
+          try {
+            return JSON.parse(text);
+          } catch {
+            // Server returns an HTML login page when the session is not valid
+            throw new Error(`Unexpected non-JSON response from server (status ${status}). Please reauthenticate using: npm run authenticate`);
+          }
+        });
       })
-      .then(resp => {
+      .then((resp) => {
         // const respData = JSON.parse(resp);
         if (status === 401) {
           throw new Error('Error occurred in authentication. Please regenerate using authenticate');
@@ -109,7 +116,7 @@ async function fetchComponentLibrariesFromInfinity(apiUrl, headers) {
         }
       })
 
-      .catch(e => reject(`${chalk.bold.red(e)}`));
+      .catch((e) => reject(`${chalk.bold.red(e)}`));
   });
 }
 
@@ -144,8 +151,8 @@ export const getInfinityLibraries = async () => {
           headers.Authorization = `${tokenType} ${accessToken}`;
 
           fetchComponentLibrariesFromInfinity(url, headers)
-            .then(response => resolve(response))
-            .catch(e => reject(e));
+            .then((response) => resolve(response))
+            .catch((e) => reject(e));
         }
       });
     } catch (error) {

package/src/tasks/list-pub/index.js

@@ -14,14 +14,15 @@ import {
   cleanUpTemp,
   getPegaServerConfig,
   getLibraryBasedCL,
-  getApplicationAndVersionFromToken
+  getApplicationAndVersionFromToken,
+  checkAccessTokenExpiration,
 } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
 
 import { SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getInfinityLibraries, getServerLocalQuestion } from './helper.js';
 
-export const getServerLibraryVersions = async libraryName => {
+export const getServerLibraryVersions = async (libraryName) => {
   addDebugLog('getServerLibraryVersions', `libraryName: ${libraryName}`, '');
 
   // server
@@ -44,7 +45,7 @@ export const getServerLibraryVersions = async libraryName => {
   return versionList;
 };
 
-export default async options => {
+export default async (options) => {
   const isLibraryBased = getLibraryBased();
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`);
@@ -90,8 +91,8 @@ export default async options => {
             name: 'library',
             type: 'rawlist',
             message: 'Pick library',
-            choices: arLibs
-          }
+            choices: arLibs,
+          },
         ]);
 
         libraryName = libAnswers.library;
@@ -110,8 +111,8 @@ export default async options => {
               name: 'libVersion',
               type: 'rawlist',
               message: 'Enter version',
-              choices: libVersions
-            }
+              choices: libVersions,
+            },
           ]);
 
           selectedVersion = libAnswers.libVersion;
@@ -126,12 +127,12 @@ export default async options => {
           builtOn = new Date(data[0].buildDate);
         }
 
-        let libData = data.map(component => ({
+        let libData = data.map((component) => ({
           Component: component.name,
           Label: component.label,
           Version: component.version,
           Type: component.type,
-          'Sub Type': component.subtype
+          'Sub Type': component.subtype,
         }));
         console.log(chalk.bold.blueBright(`\nList of ${chalk.inverse(`Local`)} ${libraryName}:${selectedVersion} components built on ${builtOn}.`));
         console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);
@@ -146,6 +147,8 @@ export default async options => {
       console.log(chalk.redBright(`\nNo local libraries exist.`));
     }
   } else {
+    await checkAccessTokenExpiration();
+
     const isLibraryBasedCL = getLibraryBasedCL();
     if (isLibraryBasedCL) {
       const arLibs = await getInfinityLibraries();
@@ -155,7 +158,7 @@ export default async options => {
         // const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel, value: index}));
         const libs = arLibs.pxResults.map((oLib, index) => ({
           name: `${oLib.pyLabel} (${oLib.pyRuleSet}:${oLib.pyRuleSetVersion})`,
-          value: index
+          value: index,
         }));
 
         const serverConfig = await getPegaServerConfig();
@@ -168,8 +171,8 @@ export default async options => {
             name: 'library',
             type: 'rawlist',
             message: 'Pick component library',
-            choices: libs
-          }
+            choices: libs,
+          },
         ]);
 
         const libraryIndex = libAnswers.library;
@@ -185,15 +188,15 @@ export default async options => {
           builtOn = new Date(data[0].buildDate);
         }
 
-        let libData = data.map(component => ({
+        let libData = data.map((component) => ({
           Component: component.name,
           Label: component.label,
           Version: component.version,
           Type: component.type,
-          'Sub Type': component.subtype
+          'Sub Type': component.subtype,
         }));
         console.log(
-          chalk.bold.blueBright(`\nList of ${library} from ${chalk.inverse(`${ruleSet}:${ruleSetVersion}`)} components built on ${builtOn}.`)
+          chalk.bold.blueBright(`\nList of ${library} from ${chalk.inverse(`${ruleSet}:${ruleSetVersion}`)} components built on ${builtOn}.`),
         );
         console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);
       } else {
@@ -215,8 +218,8 @@ export default async options => {
             name: 'library',
             type: 'rawlist',
             message: 'Pick library',
-            choices: arLibs
-          }
+            choices: arLibs,
+          },
         ]);
 
         libraryName = libAnswers.library;
@@ -229,8 +232,8 @@ export default async options => {
               name: 'libVersion',
               type: 'rawlist',
               message: 'Enter version',
-              choices: keys
-            }
+              choices: keys,
+            },
           ]);
 
           const selectedVersion = libVersionAnswers.libVersion;
@@ -244,12 +247,12 @@ export default async options => {
             builtOn = new data[0].buildDate();
           }
 
-          let libData = data.map(component => ({
+          let libData = data.map((component) => ({
             Component: component.name,
             Label: component.label,
             Version: component.version,
             Type: component.type,
-            'Sub Type': component.subtype
+            'Sub Type': component.subtype,
           }));
           console.log(chalk.bold.blueBright(`\nList of ${libraryName}/${selectedVersion} components built on ${builtOn}.`));
           console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);

package/src/tasks/move/helper.js

@@ -12,12 +12,12 @@ export const getComponentKeyQuestion = async (localComponents, copyMoveLC, param
       pageSize: 15,
       message: `Select component to ${copyMoveLC} ${orAll}`,
       choices: localComponents,
-      when: () => !paramComponentKey
-    }
+      when: () => !paramComponentKey,
+    },
   ];
 };
 
-export const getLibraryQuestions = async archLibs => {
+export const getLibraryQuestions = async (archLibs) => {
   addDebugLog('getLibraryQuestions', '', '');
   const configDef = getConfigDefaults();
 
@@ -26,8 +26,8 @@ export const getLibraryQuestions = async archLibs => {
       name: 'libraryName',
       type: 'rawlist',
       message: 'Select library to move to',
-      choices: archLibs
-    }
+      choices: archLibs,
+    },
   ];
 };
 
@@ -40,14 +40,14 @@ export const getLibraryVersionQuestion = async (libraryName, libVersions, copyOr
       name: 'version',
       type: 'rawlist',
       message: `Select ${chalk.green.bold(`${libraryName}`)} library version to ${copyOrMove} to`,
-      choices: libVersions
+      choices: libVersions,
     },
     {
       name: 'copyShared',
       type: 'confirm',
       message: `Copy ${chalk.yellow.bold('/shared')} directory (same named files will be overridden) ?`,
       default: true,
-      when: answers => answers.version != configDef.buildVersion && libraryName != configDef.library
-    }
+      when: (answers) => answers.version != configDef.buildVersion && libraryName != configDef.library,
+    },
   ];
 };

package/src/tasks/move/index.js

@@ -1,9 +1,7 @@
 import fs from 'fs';
-import { promisify } from 'util';
 import { join } from 'path';
 
 import inquirer from 'inquirer';
-import ncp from 'ncp';
 import chalk from 'chalk';
 
 import {
@@ -20,7 +18,7 @@ import {
   zipVersionAndArchive,
   getLibraryArchivesVersions,
   getLibraryArchiveDirectories,
-  cleanUpTemp
+  cleanUpTemp,
 } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
 import { getComponentKeyQuestion, getLibraryQuestions, getLibraryVersionQuestion } from './helper.js';
@@ -31,12 +29,10 @@ const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
 
 import { convertIntoPascalCase, getComponentDirectoryPath } from '../../util.js';
 
-const copy = promisify(ncp);
-
 export const updateConfig = async (
   { oldComponentKey, newComponentKey, compName, library, version, compLabel, targetDirectory },
   options,
-  onlyCompanion = false
+  onlyCompanion = false,
 ) => {
   addDebugLog('updateConfig', `oldComponentKey: ${oldComponentKey}, newComponentKey: ${newComponentKey}`, '');
 
@@ -56,7 +52,7 @@ export const updateConfig = async (
   // stringify "4", makes the json string look like JSON in the file, formatted instead of a single line
   fs.writeFileSync(join(targetDirectory, '/config.json'), JSON.stringify(configData, null, 4), {
     encoding: 'utf8',
-    flag: 'w'
+    flag: 'w',
   });
 };
 
@@ -64,7 +60,7 @@ export const updateFile = async (fileName, oldComponentKeyPC, newComponentKeyPC,
   addDebugLog(
     'updateFile',
     `fileName: ${fileName}, oldComponentKeyPC: ${oldComponentKeyPC}, newComponentKeyPC: ${newComponentKeyPC}, targetDirectory: ${targetDirectory}`,
-    ''
+    '',
   );
 
   let fileData = fs.readFileSync(join(targetDirectory, '/', fileName), { encoding: 'utf8' });
@@ -122,9 +118,9 @@ export const renameComponent = async (componentKey, library, version, copyMove,
           library,
           version,
           compLabel,
-          targetDirectory
+          targetDirectory,
         },
-        options
+        options,
       );
     } else {
       await updateFile(fileName, oldComponentKeyPC, newComponentKeyPC, targetDirectory);
@@ -159,7 +155,7 @@ export const moveComp = async (componentKey, copyMove, orgLibName, version, copy
         newComponentKey = await localMoveCopyComp(localComponentKey.value, orgLibName, version, copyMove, currentDirectory, tempDirectory);
         if (newComponentKey) {
           console.log(
-            `${copiedOrMoved} ${chalk.green(`${localComponentKey.value}`)} to ${chalk.green(`${orgLibName}/${version}`)} as ${chalk.green(`${newComponentKey}`)}`
+            `${copiedOrMoved} ${chalk.green(`${localComponentKey.value}`)} to ${chalk.green(`${orgLibName}/${version}`)} as ${chalk.green(`${newComponentKey}`)}`,
           );
         } else {
           console.log(chalk.yellow(`Not ${copiedOrMoved}`));
@@ -193,7 +189,7 @@ export const moveComp = async (componentKey, copyMove, orgLibName, version, copy
       }
 
       console.log(
-        `\n${copiedOrMoved} ${chalk.green(`${componentKey}`)} to ${chalk.green(`${orgLibName}/${version}`)} as ${chalk.green(`${newComponentKey}`)}\n`
+        `\n${copiedOrMoved} ${chalk.green(`${componentKey}`)} to ${chalk.green(`${orgLibName}/${version}`)} as ${chalk.green(`${newComponentKey}`)}\n`,
       );
 
       // rearchive temp directory
@@ -203,7 +199,7 @@ export const moveComp = async (componentKey, copyMove, orgLibName, version, copy
       if (orgLibName === configDef.currentOrgLib && version === configDef.buildVersion && copyMove === 'Copy') {
         fs.cpSync(join(tempCompPath, newComponentKey), join(currentCompPath, newComponentKey), {
           recursive: true,
-          force: true
+          force: true,
         });
       }
     } else {
@@ -234,7 +230,7 @@ export const localMoveCopyComp = async (componentKey, orgLibName, version, copyM
       {
         name: 'componentName',
         message: 'Enter component name (required)',
-        validate: value => {
+        validate: (value) => {
           /* value should not be empty
             It should not have spaces
             It should not start with a number
@@ -244,18 +240,18 @@ export const localMoveCopyComp = async (componentKey, orgLibName, version, copyM
             return true;
           }
           return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
-        }
+        },
       },
       {
         name: 'componentLabel',
         message: 'Enter component label for display (required)',
-        validate: value => {
+        validate: (value) => {
           if (value) {
             return true;
           }
           return 'Please provide value for label';
-        }
-      }
+        },
+      },
     ]);
 
     //
@@ -267,8 +263,8 @@ export const localMoveCopyComp = async (componentKey, orgLibName, version, copyM
         name: 'confirmOverride',
         type: 'confirm',
         message: `Component ${chalk.yellow(`${tempCompName}`)} currently exists in ${chalk.yellow(`${orgLibName}/${version}`)}, override?`,
-        default: false
-      }
+        default: false,
+      },
     ]);
     if (!answers.confirmOverride) {
       return null;
@@ -284,7 +280,7 @@ export const localMoveCopyComp = async (componentKey, orgLibName, version, copyM
   return newComponentKey;
 };
 
-export default async options => {
+export default async (options) => {
   await showVersion();
   await checkLibraryAndArchives();
 
@@ -367,8 +363,8 @@ export default async options => {
         type: 'rawlist',
         message: 'Copy or Move',
         choices: ['Copy', 'Move'],
-        default: 'Copy'
-      }
+        default: 'Copy',
+      },
     ];
 
     const copyMoveAnswer = await inquirer.prompt(copyMoveQuestion);

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

@@ -23,11 +23,11 @@ export const copyWebPack = async () => {
         name: 'override',
         type: 'confirm',
         message: `Overwrite`,
-        default: false
-      }
+        default: false,
+      },
     ];
 
-    await inquirer.prompt(questions).then(async answers => {
+    await inquirer.prompt(questions).then(async (answers) => {
       override = answers.override;
     });
   }
@@ -64,7 +64,7 @@ export const copyWebPack = async () => {
   }
 };
 
-export default async options => {
+export default async (options) => {
   const isLibraryBased = getLibraryBased();
   if (isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('non library mode')} components.`);