@pega/custom-dx-components 24.2.16 → 25.1.10-alpha-0.2

package/src/tasks/init/template/tasks.config.json

@@ -38,6 +38,6 @@
     "icon": ""
   },
   "usePromotedWebPack": false,
-  "libraryMode": false,
+  "libraryModeCL": false,
   "showDebug": false
 }

package/src/tasks/init/template/tsconfig.json

@@ -9,6 +9,9 @@
     "baseUrl": "./",
     "paths": {
       "@pega/pcore-pconnect-typedefs/*": ["node_modules/@pega/pcore-pconnect-typedefs/*"]
-    }
+    },
+    "esModuleInterop": true,
+    "types": ["jest", "node", "@types/jest"],
+    "verbatimModuleSyntax": false
   }
 }

package/src/tasks/list/helper.js

@@ -4,8 +4,23 @@ import chalk from 'chalk';
 import fetch from 'node-fetch';
 import { join } from 'path';
 
-import { LIST_COMPONENT_SERVICE_REST_ENDPOINT, LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH, COMPONENT_SCHEMA, TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
-import { constructCompleteUrl, getComponents, getPegaServerConfig, getHttpsAgent, addDebugLog, getLibraryBased, getComponentsConfigs, getConfigDefaults } from '../../util.js';
+import {
+  LIST_COMPONENT_SERVICE_REST_ENDPOINT,
+  LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT,
+  TOKEN_PATH, COMPONENT_SCHEMA,
+  TASKS_CONFIG_JSON_FILENAME,
+  COMPONENTS_DIRECTORY_PATH,
+  COMPONENTS_PATH } from '../../constants.js';
+import {
+  constructCompleteUrl,
+  getComponents,
+  getPegaServerConfig,
+  getHttpsAgent,
+  addDebugLog,
+  getLibraryBased,
+  getComponentsConfigs,
+  getConfigDefaults,
+  checkAccessTokenExpiration } from '../../util.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -208,6 +223,10 @@ addDebugLog("getComponentsFromServer", `library: ${library}, organization: ${org
     isLaunchpad ? LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT : LIST_COMPONENT_SERVICE_REST_ENDPOINT
   );
 
+  if (!isLaunchpad) {
+    await checkAccessTokenExpiration;
+  }
+
 
 
   return new Promise((resolve, reject) => {

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

@@ -1,7 +1,16 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs, cleanUpTemp } from '../../util.js';
+import {
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  checkLibraryAndArchives,
+  getLibraryArchivesVersions,
+  getConfigDefaults,
+  getLocalArchivedLibrraryVersionData,
+  getComponentsConfigs,
+  cleanUpTemp } from '../../util.js';
 import { getArchiveLibraryQuestions } from './helper.js';
 
 export default async (options) => {

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

@@ -1,12 +1,20 @@
+
+import fs from 'fs';
 import chalk from 'chalk';
+import fetch from 'node-fetch';
+
 
 import {
   getPegaServerConfig,
   addDebugLog,
-  getC11NB2STokenAndStaticServer
+  getC11NB2STokenAndStaticServer,
+  getApplicationAndVersionFromToken,
+  constructCompleteUrl,
+  getHttpsAgent
 } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
+import { LIST_COMPONENT_LIBRARIES_SERVICE_REST_ENDPOINT, TOKEN_PATH } from '../../constants.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -72,3 +80,96 @@ addDebugLog("listLibJSONResponse", "services end", "");
   return [];
 
 }
+
+async function fetchComponentLibrariesFromInfinity(apiUrl, headers) {
+addDebugLog("fetchComponentLibrariesFromInfinity", `apiUrl: ${apiUrl}`, "");
+  const serverConfig = await getPegaServerConfig();
+  return new Promise((resolve, reject) => {
+    let status = 500;
+    fetch(apiUrl, {
+      method: 'GET',
+      agent: getHttpsAgent(serverConfig),
+      headers
+    })
+      .then((response) => {
+        status = response.status;
+        if (status === 401) {
+          throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+        }
+        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');
+        }
+        return response.json();
+      })
+      .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) {
+          resolve(resp);
+        } else {
+          throw new Error(`${resp.message}`);
+        }
+      })
+      // eslint-disable-next-line prefer-promise-reject-errors
+      .catch((e) => reject(`${chalk.bold.red(e)}`));
+  });
+}
+
+export const getInfinityLibraries = async() => {
+addDebugLog("getInfinityLibraries", '', "");
+
+  const { app_name, app_version } = await getApplicationAndVersionFromToken();
+  const defaultPegaServerConfig = await getPegaServerConfig();
+  let url = constructCompleteUrl(
+    defaultPegaServerConfig.server,
+    LIST_COMPONENT_LIBRARIES_SERVICE_REST_ENDPOINT
+  );
+
+  const ApplicationName = app_name;
+  const ApplicationVersion = app_version;
+  const rulesetName = defaultPegaServerConfig.rulesetName;
+  const rulesetVersion = defaultPegaServerConfig.rulesetVersion;
+
+  let urlParams = `/app-name/${ApplicationName}/app-version/${ApplicationVersion}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
+  //let urlParams = `&ApplicationName=${ApplicationName}&ApplicationVersion=${ApplicationVersion}&RulesetName=${rulesetName}&RulesetVersion=${rulesetVersion}`;
+  //urlParams = encodeURIComponent(urlParams);
+
+
+  url = url.concat(urlParams);
+
+  return new Promise((resolve, reject) => {
+    try {
+      fs.readFile(TOKEN_PATH, 'utf8', (err, data) => {
+        if (err) {
+          // eslint-disable-next-line prefer-promise-reject-errors
+          reject(`\n${chalk.bold.red('Error occurred in authentication. Please regenerate using authenticate')}`);
+        }
+        if (data) {
+          const { access_token: accessToken, token_type: tokenType } = JSON.parse(data);
+
+          const headers = {};
+          headers.Authorization = `${tokenType} ${accessToken}`;
+
+          fetchComponentLibrariesFromInfinity(url, headers)
+            .then((response) => resolve(response))
+            .catch((e) => reject(e));
+
+        }
+      });
+    } catch (error) {
+      console.log(`\n${chalk.bold.red(error)}`);
+      // eslint-disable-next-line prefer-promise-reject-errors
+      reject(`${chalk.bold.red(error)}`);
+    }
+  });
+
+}

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

@@ -1,11 +1,24 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraries, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults, cleanUpTemp } from '../../util.js';
+import {
+  showVersion,
+  getC11NB2STokenAndStaticServer,
+  getLocalLibraries,
+  getLocalLibraryVersions,
+  getLocalLibraryVersionData,
+  getLibraryBased,
+  addDebugLog,
+  checkLibraryAndArchives,
+  getConfigDefaults,
+  cleanUpTemp,
+  getPegaServerConfig,
+  getLibraryBasedCL,
+  getApplicationAndVersionFromToken } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
 
-import { getListLibraryQuestions, SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getServerLocalQuestion } from './helper.js';
+import { SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getInfinityLibraries,  getServerLocalQuestion } from './helper.js';
 
 
 
@@ -119,11 +132,11 @@ addDebugLog("listPublished", "", "+");
         // get built on from first component if exists
         let builtOn = "(date unavailable)";
         if (data[0] && data[0].buildDate) {
-          builtOn = data[0].buildDate;
+          builtOn = new Date(data[0].buildDate);
         }
 
         let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
-        console.log(chalk.bold.blueBright(`\nList of ${libraryName}:${selectedVersion} components built on ${builtOn}.`));
+        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']);
 
     }
@@ -139,61 +152,120 @@ addDebugLog("listPublished", "END", "-");
   }
   else {
 
-    const arLibs = await getServerLibraries();
-    if (arLibs && arLibs.length > 0) {
+    const isLibraryBasedCL =  getLibraryBasedCL();
+    if (isLibraryBasedCL) {
+      const arLibs = await getInfinityLibraries();
 
-      const libAnswers = await inquirer.prompt([
-        {
-          name: 'library',
-          type: 'rawlist',
-          message: 'Pick library',
-          choices: arLibs
-        }
-      ]);
+      if (arLibs && arLibs.pxResults && arLibs.pxResults.length > 0) {
 
-      libraryName = libAnswers.library;
-      const libVersions = await getServerLibraryVersions(libraryName);
+        const libs = arLibs.pxResults.map((oLib, index) => ({ name: oLib.pyLabel, value: index}));
 
-      if (libVersions) {
-        const keys = Object.keys(libVersions);
-        const libVersionAnswers = await inquirer.prompt([
 
+        const {app_name, app_version } = await getApplicationAndVersionFromToken();
+        const serverConfig = await getPegaServerConfig();
+        console.log(`\nServer ${chalk.green.bold(`${serverConfig.server}`)}.`);
+        console.log(chalk.green(`List of libraries for Application: ${chalk.bold.green(`${app_name} - ${app_version}`)}`));
+        console.log(`in ruleset: ${chalk.green.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`);
+
+
+        const libAnswers = await inquirer.prompt([
           {
-            name: 'libVersion',
+            name: 'library',
             type: 'rawlist',
-            message: 'Enter version',
-            choices: keys
+            message: 'Pick library',
+            choices: libs
           }
         ]);
 
-        const selectedVersion = libVersionAnswers.libVersion;
+        const libraryIndex = libAnswers.library;
 
-        const versionData = libVersions[selectedVersion];
-        const data = JSON.parse(versionData);
+        const data = JSON.parse(arLibs.pxResults[libraryIndex].pxComponentDefinition);
+        const library = arLibs.pxResults[libraryIndex].pyLabel.replace(" ", "/");
+        const ruleSet = arLibs.pxResults[libraryIndex].pyRuleSet;
+        const ruleSetVersion = arLibs.pxResults[libraryIndex].pyRuleSetVersion;
 
         // get built on from first component if exists
         let builtOn = "(date unavailable)";
         if (data[0] && data[0].buildDate) {
-          builtOn = data[0].buildDate;
+          builtOn = new Date(data[0].buildDate);
+
         }
 
         let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
-        console.log(chalk.bold.blueBright(`\nList of ${libraryName}:${selectedVersion} components built on ${builtOn}.`));
+        console.log(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 {
+        // No library with that name
+        const serverConfig = await getPegaServerConfig();
+        console.log(chalk.redBright(`No server component libraries exist in given ruleset ${chalk.bold(`${serverConfig.rulesetName}:${serverConfig.rulesetVersion}`)}`));
+        console.log(chalk.redBright(`You need to publish a library to this ruleset first.`));
+  addDebugLog("listPublished", "END", "-");
+        process.exit(1);
+
+      }
     }
     else {
-      console.log(chalk.red("No libraries available on server."));
-    }
 
+      // old app static server
 
+      const arLibs = await getServerLibraries();
+      if (arLibs && arLibs.length > 0) {
 
-    }
-    else {
-      // No library with that name
-      console.log(chalk.redBright(`No server library named: ${libraryName} exists.`));
-      console.log(chalk.redBright(`You need to publish library: ${libraryName} first.`));
-addDebugLog("listPublished", "END", "-");
-      process.exit(1);
+        const libAnswers = await inquirer.prompt([
+          {
+            name: 'library',
+            type: 'rawlist',
+            message: 'Pick library',
+            choices: arLibs
+          }
+        ]);
+
+        libraryName = libAnswers.library;
+        const libVersions = await getServerLibraryVersions(libraryName);
+
+        if (libVersions) {
+          const keys = Object.keys(libVersions);
+          const libVersionAnswers = await inquirer.prompt([
+
+            {
+              name: 'libVersion',
+              type: 'rawlist',
+              message: 'Enter version',
+              choices: keys
+            }
+          ]);
+
+          const selectedVersion = libVersionAnswers.libVersion;
+
+          const versionData = libVersions[selectedVersion];
+          const data = JSON.parse(versionData);
+
+          // get built on from first component if exists
+          let builtOn = "(date unavailable)";
+          if (data[0] && data[0].buildDate) {
+            builtOn = new data[0].buildDate;
+          }
+
+          let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, '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']);
+        }
+        else {
+          console.log(chalk.red("No libraries available on server."));
+        }
+
+
+      }
+      else {
+        // No library with that name
+        console.log(chalk.redBright(`No server library named: ${libraryName} exists.`));
+        console.log(chalk.redBright(`You need to publish library: ${libraryName} first.`));
+  addDebugLog("listPublished", "END", "-");
+        process.exit(1);
+
+      }
 
     }
 

package/src/tasks/move/index.js

@@ -176,7 +176,7 @@ export const moveComp = async(componentKey, copyMove, orgLibName, version, copyS
     const currentDirectory = process.cwd();
     const tempDirectory = join(currentDirectory, TEMP_PATH);
     const archiveDirectory = join (currentDirectory, ARCHIVES_PATH, `${orgLibName}`, `${version}`);
-    const fileName = `${orgLibName}_${version}.zip`;
+    const fileName = `${orgLibName}_${version}.arch.zip`;
     const archFileName = join(archiveDirectory, fileName);
     const currentCompPath = join(currentDirectory, "src", "components");
     const tempCompPath = join(tempDirectory, "src", "components");

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

@@ -84,9 +84,6 @@ addDebugLog("copyWebPack","", "");
   }
 
 
-
-
-
 }
 
 

package/src/tasks/publish/helper.js

@@ -79,7 +79,8 @@ addDebugLog("getPublishComponentQuestions", `componentKey: ${componentKey}`, "")
       name: 'devBuild',
       type: 'confirm',
       message: 'Generate development build ?',
-      default: defaultPegaConfig.devBuild
+      default: defaultPegaConfig.devBuild,
+      when: () => componentKey !== "LibraryMode"
     }
   ];
 };
@@ -217,27 +218,28 @@ addDebugLog("publishComponentToServer", `data: ${data}`, "");
 
         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);
+            throw Error( "\n" + respData.message);
           }
+
+          console.log(chalk.bold.green(`Success : ${isLaunchpad ? respData : 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);
+            throw  Error(err);
           }
         }
       } else {
-        throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+        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(err);
+      throw  Error(err);
     }
   }
 };

package/src/tasks/publish/index.js

@@ -6,7 +6,21 @@ import fs from 'fs';
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponentDirectoryPath, showVersion, getLibraryBased, getUseInputConfig, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives, getConfigDevBuild, checkJWTExpiration, getConfigDefaults, getInputConfigForCommand } from '../../util.js';
+import {
+  getComponentDirectoryPath,
+  getPegaServerConfig,
+  showVersion,
+  getLibraryBased,
+  getLibraryBasedCL,
+  getUseInputConfig,
+  addDebugLog,
+  updateServerConfigRuleSetAndVersion,
+  checkLibraryAndArchives,
+  getConfigDevBuild,
+  checkAccessTokenExpiration,
+  checkJWTExpiration,
+  getConfigDefaults,
+  getInputConfigForCommand } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 import { default as buildLibrary } from '../build-lib/index.js';
@@ -21,28 +35,39 @@ export default async options => {
   await showVersion();
   await checkLibraryAndArchives();
   const isLibraryBased = getLibraryBased();
+  const isLibraryBasedCL = getLibraryBasedCL();
   const useInputConfig = getUseInputConfig();
 
+
 addDebugLog("publish", "", "+");
 
+  await checkAccessTokenExpiration();
+
+  //
+  // library based V2 publishing
+  //
   if (isLibraryBased) {
 
     await checkJWTExpiration();
 
     const devBuild = await getConfigDevBuild();
     let okToPublish = false;
+    // let content;
 
     const orgLib =  getConfigDefaults();
     const currentOrgLib = orgLib.currentOrgLib;
     // const currentVersion = devBuild ? `${orgLib.version}-dev`: orgLib.version;
     const currentVersion = orgLib.buildVersion;
+    const serverConfg = await getPegaServerConfig();
 
+    console.log();
+    console.log(`Publishing to server: ${chalk.green.bold(`${serverConfg.server}`)}`);
 
     if (useInputConfig) {
       const inputConfig = await getInputConfigForCommand("publish");
 
-      console.log("Input config: ");
-      console.log(inputConfig);
+      // console.log("Input config: ");
+      // console.log(inputConfig);
 
       if (inputConfig.okToPublish ) {
         if (devBuild || (!devBuild && inputConfig.okToPublishPermanent)) {
@@ -51,6 +76,10 @@ addDebugLog("publish", "", "+");
 
       }
 
+
+      options.params.push(inputConfig.ruleSetName);
+      options.params.push(inputConfig.ruleSetVersion);
+
     }
     else {
       const publishThisVersion = await inquirer.prompt([
@@ -66,20 +95,48 @@ addDebugLog("publish", "", "+");
         okToPublish = true;
       }
 
-      if (okToPublish && !devBuild) {
-        okToPublish = false;
-        console.log("");
-        const publishAnswers = await inquirer.prompt([
-          {
-            name: 'confirmPublish',
-            type: 'confirm',
-            message: `You are about to publish a ${chalk.bold.yellow('PRODUCTION')} version which can ${chalk.bold.yellow('NOT')} be deleted, proceed ?`,
-            default: false
-          }
-        ]);
-        if (publishAnswers.confirmPublish) {
-          okToPublish = true;
+    }
+
+    if (okToPublish) {
+      if (options.params.length >= 8 || useInputConfig) {
+        // const rulesetName = options.params[3];
+        // const rulesetVersion = options.params[4]
+
+
+        // content = { rulesetName, rulesetVersion };
+      } else {
+        // VS Code pluggin would send in the component
+        let paramComponentKey;
+        if (options.params.length == 4) {
+          paramComponentKey = options.params[3];
+        }
+
+        const questions = await getPublishComponentQuestions("LibraryMode");
+        const answers = await inquirer.prompt(questions);
+
+        // content = {
+        //   ...answers
+        // };
+        options.params.push(answers.rulesetName);
+        options.params.push(answers.rulesetVersion);
+
+        updateServerConfigRuleSetAndVersion(answers.rulesetName, answers.rulesetVersion);
+      }
+    }
+
+    if (okToPublish && !devBuild && !isLibraryBasedCL) {
+      okToPublish = false;
+      console.log("");
+      const publishAnswers = await inquirer.prompt([
+        {
+          name: 'confirmPublish',
+          type: 'confirm',
+          message: `You are about to publish a ${chalk.bold.yellow('PRODUCTION')} version which can ${chalk.bold.yellow('NOT')} be deleted, proceed ?`,
+          default: false
         }
+      ]);
+      if (publishAnswers.confirmPublish) {
+        okToPublish = true;
       }
     }
 
@@ -87,13 +144,25 @@ addDebugLog("publish", "", "+");
       // marking as internal, so no questions will be ask
       options.params.push("internal");
 
+
       await buildLibrary(options);
       await publishLibrary(options);
+
+
     }
 
+    // end of V2 publishing
     return true;
+
+
+
   }
 
+  // otherwise continue with original V1 publishig of individual components
+
+  //
+  // orginial V1 publish
+  //
 
   let OauthData;
   try {

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

@@ -5,7 +5,16 @@ import chalk from 'chalk';
 import validate from '../validator/index.js';
 import bundleComponent from '../bundle/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponents, getComponentDirectoryPath, showVersion, getLibraryBased, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives } from '../../util.js';
+import {
+  getComponents,
+  getComponentDirectoryPath,
+  checkAccessTokenExpiration,
+  showVersion,
+  getLibraryBased,
+  addDebugLog,
+  getPegaServerConfig,
+  updateServerConfigRuleSetAndVersion,
+  checkLibraryAndArchives } from '../../util.js';
 
 import {
   getPublishComponentQuestions,
@@ -72,6 +81,8 @@ export default async options => {
   await showVersion();
   await checkLibraryAndArchives();
 
+  await checkAccessTokenExpiration();
+
 addDebugLog("publishAll", "", "+");
 
   const components = await getComponents();