@pega/custom-dx-components 0.242.31 → 0.242.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.242.31",
+  "version": "0.242.33",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/tasks/create-lib/helper.js

@@ -17,7 +17,7 @@ addDebugLog("getCreateLibComponentQuestions", "", "");
       name: 'okToContinue',
       type: 'confirm',
       message: 'Ok to continue ?',
-      default: false
+      default: true
     }
   ];
 
@@ -56,7 +56,7 @@ addDebugLog("getCreateLibComponentQuestions", "", "");
         }
         else {
           return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
-    }
+        }
       }
     },
     {

package/src/tasks/export-archive/index.js

@@ -201,7 +201,7 @@ export default async options => {
     const filePathAnswers = await inquirer.prompt(filePathQuestions);
     const { filePath } = filePathAnswers;
 
-    await exportArch( zipFilePath, orgLibName, selectedVersion);
+    await exportArch( filePath, orgLibName, selectedVersion);
 
   }
 

package/src/tasks/import-archive/helper.js

@@ -1,13 +1,244 @@
 import chalk from 'chalk';
+import fs from 'fs';
 import path from 'path';
 import { join } from 'path';
-import { addDebugLog, getConfigDefaults, getLibraryArchiveDirectories, getLibraryBased } from '../../util.js';
+import { Listr } from 'listr2';
+import { addDebugLog, getConfigDefaults, convertIntoPascalCase, getComponents, getComponentDirectoryPath, getDirectoryFiles } from '../../util.js';
+import { TASKS_CONFIG_JSON_FILENAME, TEMP_PATH, PACKAGE_JSON_FILENAME } from '../../constants.js';
+
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
   LOCAL: 'Local'
 };
 
+export const setTasksConfig = async (libraryName, version, devBuild, currDir) => {
+addDebugLog("setTasksConfig", `libraryName: ${libraryName}, version: ${version}, devBuild: ${devBuild}`, "");
+  const pegaConfigJsonPath = join(currDir, TASKS_CONFIG_JSON_FILENAME);
+  const sPegaData = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  const configData = JSON.parse(sPegaData);
+  let serverConfig = configData['server-config'];
+  serverConfig.devBuild = devBuild;
+  let compConfig = configData['component'];
+  compConfig.library = libraryName;
+  compConfig.version = version;
+
+  // update file
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(configData, null, 4), { encoding: 'utf8' });
+}
+
+export const setPackageOrg = async (organization, currDir) => {
+addDebugLog("setPackageOrg", "", "");
+  const packageJsonPath = join(currDir, PACKAGE_JSON_FILENAME);
+  const sPackage = fs.readFileSync(packageJsonPath, { encoding: 'utf8'});
+  const packageData = JSON.parse(sPackage);
+
+  packageData.organization = organization;
+
+    // update file
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageData, null, 4), { encoding: 'utf8' });
+
+}
+
+export const updateConfig = async (
+  {
+    oldComponentKey,
+    newComponentKey,
+    organization,
+    library,
+    version,
+    currentDirectory,
+  }
+) => {
+
+addDebugLog("updateConfig", `oldComponentKey: ${oldComponentKey}, newComponentKey: ${newComponentKey}`, "");
+
+  let configData = fs.readFileSync(join(currentDirectory, "/config.json"), { encoding: 'utf8' });
+  configData = configData && JSON.parse(configData);
+
+  configData.name = newComponentKey;
+  if (configData.componentKey) configData.componentKey = newComponentKey;
+  configData.organization = organization;
+  configData.library = library;
+  configData.version = version;
+
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(join(currentDirectory, "/config.json"), JSON.stringify(configData, null, 4), { encoding: 'utf8' });
+
+};
+
+export const updateFile = async (
+    fileName,
+    oldComponentKeyPC,
+    newComponentKeyPC,
+    currentDirectory,
+) => {
+
+addDebugLog("updateFile", `fileName: ${fileName}, oldComponentKeyPC: ${oldComponentKeyPC}, newComponentKeyPC: ${newComponentKeyPC}, currentDirectory: ${currentDirectory}`, "");
+
+  let fileData = fs.readFileSync(join(currentDirectory, "/", fileName), { encoding: 'utf8' });
+
+  if (fileData.indexOf(oldComponentKeyPC) >= 0) {
+    fileData = fileData.replaceAll(oldComponentKeyPC, newComponentKeyPC);
+
+    fs.writeFileSync(join(currentDirectory, "/", fileName), fileData, { encoding: 'utf8' });
+  }
+
+};
+
+export const reanmeDirectory = async(currentDirectory, targetDirectory) => {
+  if (!fs.existsSync(targetDirectory)) {
+    fs.mkdirSync(targetDirectory, { recursive: true });
+  }
+
+  const targetFileList = await getDirectoryFiles(currentDirectory);
+  for (const targetFile of targetFileList) {
+    const currentFilePath = join(currentDirectory, targetFile);
+    const targetFilePath = join(targetDirectory, targetFile);
+    fs.copyFileSync(currentFilePath, targetFilePath)
+  }
+
+  // fs.rm(currentDirectory, { recursive: true }, err => {
+  //   if (err) {
+  //     throw err;
+  //   }
+  // });
+
+  fs.rmSync(currentDirectory, { recursive: true, force: true, maxRetries: 2  });
+
+
+}
+
+// rename the component
+export const renameComponent = async (
+  componentKey,
+  library,
+  version,
+  currDir
+) => {
+
+addDebugLog("renameComponent", `library: ${library}, componentKey: ${componentKey}`, "");
+
+
+const componentName = componentKey.split("_")[2];
+
+const configDef = getConfigDefaults();
+const orgLibName = `${configDef.organization}_${library}`;
+const organization = configDef.organization;
+
+const newComponentKey = `${orgLibName}_${componentName}`;
+
+const oldComponentKey = componentKey;
+const newComponentKeyPC = convertIntoPascalCase(newComponentKey);
+const oldComponentKeyPC = convertIntoPascalCase(oldComponentKey);
+
+const currentDirectory = await getComponentDirectoryPath(componentKey, currDir);
+const targetDirectory = await getComponentDirectoryPath(newComponentKey, currDir);
+
+const targetFileList = await getDirectoryFiles(currentDirectory);
+
+for (const fileIndex in targetFileList) {
+  const fileName = targetFileList[fileIndex];
+
+  if (fileName === "config.json") {
+    await updateConfig(
+      {
+        oldComponentKey,
+        newComponentKey,
+        componentName,
+        organization,
+        library,
+        version,
+        currentDirectory,
+      }
+    );
+  }
+  else {
+    await updateFile(
+        fileName,
+        oldComponentKeyPC,
+        newComponentKeyPC,
+        currentDirectory );
+
+  }
+
+} // for
+
+
+
+// rename the directory
+await reanmeDirectory(currentDirectory, targetDirectory);
+
+
+return newComponentKey;
+
+};
+
+export const renameComponents = async(compList, libraryName, version, compDir) => {
+  for (const componentKey of compList) {
+    await renameComponent(componentKey, libraryName, version, compDir);
+  }
+}
+
+export const updateTempArchive = async(libraryName, version, devBuild) => {
+  const currentDirectory = process.cwd();
+  const tempStoreDirectory = join(currentDirectory, TEMP_PATH);
+  const configDef = getConfigDefaults();
+
+  // remove -dev if exists
+  const justVersion = version.replace("-dev", "");
+
+  // open tasks.config and update it
+  // await setTasksConfig(libraryName, justVersion, devBuild, tempStoreDirectory);
+
+  // open package.json, update org
+  // await setPackageOrg(configDef.organization, tempStoreDirectory);
+
+  // update all the components
+  // const compDir = join(tempStoreDirectory, "src", "components");
+  // const compList = await getComponents(compDir);
+
+  // await renameComponents(compList, libraryName, version, compDir);
+
+  const tasks = new Listr(
+    [
+      {
+        title: 'Update tasks.config',
+        task: async () => {
+          await setTasksConfig(libraryName, justVersion, devBuild, tempStoreDirectory);
+        }
+      },
+      {
+        title: 'Update package.json',
+        task: async () => {
+          await setPackageOrg(configDef.organization, tempStoreDirectory);
+        }
+      },
+      {
+        title: `Renaming components`,
+        task: async () => {
+          const compDir = join(tempStoreDirectory, "src", "components");
+          const compList = await getComponents(compDir);
+
+          await renameComponents(compList, libraryName, version, compDir);
+        }
+      }
+    ],
+    {
+      exitOnError: true
+    }
+  );
+
+  await tasks.run().catch(err => {
+    console.log(chalk.bold.red(err.toString()));
+    process.exit(1);
+  });
+
+
+}
+
 
 export const getFilePathQuestions = async () => {
 addDebugLog("getFilePathQuestions", "", "");

package/src/tasks/import-archive/index.js

@@ -7,9 +7,9 @@ import ncp from 'ncp';
 import chalk from 'chalk';
 
 import {
+  sanitize,
   checkPathAccess,
   showVersion,
-  getComponentsObj,
   getDirectoryFiles,
   addDebugLog,
   checkLibraryAndArchives,
@@ -17,16 +17,16 @@ import {
   getLibraryBased,
   unZipFromArchive,
   zipVersionAndArchive,
-  getLibraryArchivesVersions
+  getLibraryArchiveDirectories,
+  hasLibraryAndVersion
  } from '../../util.js';
-import { TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
-import { getFilePathQuestions, getFileNameQuestions  } from './helper.js';
+import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
+import { getFilePathQuestions, getFileNameQuestions, updateTempArchive  } from './helper.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
 const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
 
-
 import {
   convertIntoPascalCase,
   getComponentDirectoryPath
@@ -212,9 +212,86 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
   }
 
+
+
   const arFileData = fileName.split("_");
-  const orgLibName = `${arFileData[0]}_${arFileData[1]}`;
+  let orgLibName = `${arFileData[0]}_${arFileData[1]}`;
+  let libName = arFileData[1];
   const version = arFileData[2].replace(".zip", "");
+  const devBuild = version.indexOf("-dev") > 0 ? true : false;
+  const configDef = getConfigDefaults();
+
+  if (arFileData[0] !== configDef.organization) {
+    console.log(`\nImported ${chalk.yellow(`${orgLibName}/${version}`)} is not the same organization as your current organization: ${chalk.yellow(`${configDef.organization}`)}.`);
+    console.log(`\nTo import, the organization of the components will be changed to match your organization.`);
+    console.log(`\n\t>>> If you don't want this to happen, then end and create a new project with an organization`);
+    console.log(`\t    of ${chalk.yellow(`${arFileData[0]}`)} and import there.\n`);
+
+    const proceedAnswers = await inquirer.prompt([
+
+      {
+        name: 'okToContinue',
+        type: 'confirm',
+        message: `Ok to proceed ?`,
+        default: true
+      }
+    ]);
+
+    if (proceedAnswers.okToContinue) {
+      // check if new version matches existing
+      // -dev is already on version, if present, so "false", for devBuild here
+      const alreadyExists = await hasLibraryAndVersion(libName, version, false);
+      if (alreadyExists) {
+        console.log(`${chalk.yellow(`${configDef.organization}_${libName}/${version}`)} already exists.`);
+        const archDirectories = await getLibraryArchiveDirectories();
+        const newLibNameAnswers = await inquirer.prompt([
+          {
+            name: 'libraryName',
+            message: 'Enter new libray name',
+            validate: value => {
+              /* value should not be empty
+              It should not have spaces
+              It should not start with a number
+              Only case-insensitive alphanumeric values are allowed
+            */
+              if (value && !/^\d/.test(value) && value === sanitize(value)) {
+                if (archDirectories && archDirectories.length > 0) {
+                  const newOrgLib = `${configDef.organization}_${value}`;
+                  if (archDirectories.includes(newOrgLib)) {
+                    return `Library ${value} already exists.`;
+                  }
+                  else {
+                    return true;
+                  }
+                }
+                else {
+                  return true;
+                }
+
+              }
+              else {
+                return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
+              }
+            }
+          }
+        ]);
+
+        libName = newLibNameAnswers.libraryName;
+      }
+
+      // rename orgLibName
+      orgLibName = `${configDef.organization}_${libName}`;
+
+      // update temp with new info
+      await updateTempArchive(libName, version, devBuild);
+
+    }
+    else {
+      process.exit();
+    }
+
+
+  }
 
   // rearchive temp directory
   await zipVersionAndArchive(orgLibName, version, tempDirectory);

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

@@ -34,11 +34,11 @@
     "deleteLib": "custom-dx-components deleteLibrary",
     "deletePublishedLib": "custom-dx-components deletePublished",
     "deleteLibVersion": "custom-dx-components deleteVersion",
+    "moveLibVersion": "custom-dx-components moveComponent",
     "publishLibVersion": "custom-dx-components publish",
     "storeLibVersion": "custom-dx-components storeComponents",
     "showStatus": "custom-dx-components showStatus",
     "setPermanent": "custom-dx-components setPermanent",
-    "moveLibVersion": "custom-dx-components moveComponent",
     "importLibVersion": "custom-dx-components importArchive",
     "exportLibVersion": "custom-dx-components exportArchive",
     "validate": "custom-dx-components buildComponent",
@@ -97,7 +97,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "0.242.31",
+    "@pega/custom-dx-components": "0.242.33",
     "@pega/pcore-pconnect-typedefs": "~3.0.0",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.19",

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

@@ -2,9 +2,12 @@ import chalk from 'chalk';
 
 import {
   getPegaServerConfig,
-  addDebugLog
+  addDebugLog,
+  getC11NB2STokenAndStaticServer
 } from '../../util.js';
 
+import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
+
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
   LOCAL: 'Local'
@@ -39,4 +42,33 @@ addDebugLog("getLibraryVersionQuestion", `libraryName: ${libraryName}, libVersio
       }
     ];
 
+};
+
+export const getServerLocalQuestion = async() => {
+  addDebugLog("getServerLocalQuestion", "", "");
+  const defaultPegaConfig = await getPegaServerConfig();
+
+  return [
+    {
+      name: 'sourceOfLibrary',
+      type: 'rawlist',
+      message: `List from Server or Local ?`,
+      choices: Object.values(SOURCE_OF_COMPONENT_TYPES),
+      default: "defaultPegaConfig.sourceOfComponents",
+    }
+  ];
+};
+
+export const getServerLibraries = async() => {
+  addDebugLog("listLibJSONResponse", "services call", "");
+  // server
+  const tokenAndStaticServer = await getC11NB2STokenAndStaticServer();
+  const oLibList = await listLibJSONResponse(tokenAndStaticServer.C11NB2S, tokenAndStaticServer.appStaticContentServer);
+addDebugLog("listLibJSONResponse", "services end", "");
+  if (oLibList) {
+    return Object.keys(oLibList);
+  }
+
+  return [];
+
 }

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

@@ -1,11 +1,11 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 
-import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults } from '../../util.js';
+import {showVersion, getC11NB2STokenAndStaticServer, getLocalLibraries, getLocalLibraryVersions, getLocalLibraryVersionData, getLibraryBased, addDebugLog, checkLibraryAndArchives, getConfigDefaults } from '../../util.js';
 
 import { listLibJSONResponse } from '@pega/constellation-dx-components-build-utils/index.js';
 
-import { getListLibraryQuestions, SOURCE_OF_COMPONENT_TYPES } from './helper.js';
+import { getListLibraryQuestions, SOURCE_OF_COMPONENT_TYPES, getServerLibraries, getServerLocalQuestion } from './helper.js';
 
 
 
@@ -51,7 +51,7 @@ addDebugLog("listPublished", "", "+");
   const compDef = getConfigDefaults();
   organization = compDef.organization;
   library = compDef.library;
-  const libraryName = compDef.currentOrgLib;
+  let libraryName;
   let selectedVersion;
   let libVersions = [];
 
@@ -64,7 +64,7 @@ addDebugLog("listPublished", "", "+");
   }
   else {
 
-    const questions = await getListLibraryQuestions(libraryName);
+    const questions = await getServerLocalQuestion();
     const answers = await inquirer.prompt(questions);
     ({ sourceOfLibrary } = answers);
 
@@ -72,6 +72,18 @@ addDebugLog("listPublished", "", "+");
 
   if (sourceOfLibrary === SOURCE_OF_COMPONENT_TYPES.LOCAL ) {
     // local
+    const arLibs = await getLocalLibraries();
+
+    const libAnswers = await inquirer.prompt([
+      {
+        name: 'library',
+        type: 'rawlist',
+        message: 'Pick library',
+        choices: arLibs
+      }
+    ]);
+
+    libraryName = libAnswers.library;
 
     if (libVersions.length == 0) {
       try {
@@ -86,7 +98,6 @@ addDebugLog("listPublished", "", "+");
 
         if (selectedVersion === undefined) {
           const libAnswers = await inquirer.prompt([
-
             {
               name: 'libVersion',
               type: 'rawlist',
@@ -123,34 +134,54 @@ addDebugLog("listPublished", "END", "-");
 
   }
   else {
-    const libVersions = await getServerLibraryVersions(libraryName);
 
-    if (libVersions) {
-      const keys = Object.keys(libVersions);
-      const libAnswers = await inquirer.prompt([
+    const arLibs = await getServerLibraries();
+    if (arLibs && arLibs.length > 0) {
 
+      const libAnswers = await inquirer.prompt([
         {
-          name: 'libVersion',
+          name: 'library',
           type: 'rawlist',
-          message: 'Enter version',
-          choices: keys
-        },
+          message: 'Pick library',
+          choices: arLibs
+        }
       ]);
 
-      const selectedVersion = libAnswers.libVersion;
+      libraryName = libAnswers.library;
+      const libVersions = await getServerLibraryVersions(libraryName);
 
-      const versionData = libVersions[selectedVersion];
-      const data = JSON.parse(versionData);
+      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 = 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."));
+    }
 
-      // get built on from first component if exists
-      let builtOn = "(date unavailable)";
-      if (data[0] && data[0].buildDate) {
-        builtOn = 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 {

package/src/tasks/switch-lib/helper.js

@@ -48,13 +48,16 @@ addDebugLog("getSwitchLibraryComponentQuestions", "", "");
       name: 'okToContinue',
       type: 'confirm',
       message: 'Ok to continue ?',
-      default: false
+      default: true
     },
     {
       name: 'newOrgLib',
       type: 'rawlist',
       message: `Select a library (current library is ${chalk.bold.green(`${currentOrgLib}`)}) `,
-      choices: archVersionList
+      choices: archVersionList,
+      when(answers) {
+        return answers.okToContinue === true;
+      }
     }
   ];
 };

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

@@ -56,6 +56,10 @@ addDebugLog("switchLibrary", "", "+");
     const answers = await inquirer.prompt(questions);
     ({ okToContinue, newOrgLib } = answers);
 
+    if (!answers.okToContinue) {
+      process.exit()
+    }
+
     const nextQuestion = await getSwitchVersionComponentQuestions(newOrgLib);
     const nextAnswers = await inquirer.prompt(nextQuestion);
     ({ version } = nextAnswers);

package/src/tasks/switch-version/helper.js

@@ -46,7 +46,7 @@ addDebugLog("getSwitchVersionComponentQuestions", "", "");
       name: 'okToContinue',
       type: 'confirm',
       message: 'Ok to continue ?',
-      default: false
+      default: true
     },
     {
       name: 'version',

package/src/util.js

@@ -1162,6 +1162,18 @@ if (showDebug) addDebugLog("getC11NB2STokenAndStaticServer", "", "");
   return ({});
 };
 
+export const getLocalLibraries = async () => {
+if (showDebug) addDebugLog("getLocalLibraries", "" , "");
+  const currentDirectory = process.cwd();
+  const configDef = getConfigDefaults();
+  const libFilter = configDef.organization.concat("_");
+
+  return fs
+  .readdirSync(currentDirectory, { withFileTypes: true })
+  .filter(dirent => dirent.isDirectory() && dirent.name.startsWith(libFilter))
+  .map(dirent => dirent.name);
+}
+
 export const getLocalLibraryVersions = async (libraryName, currentVersion = "0.0.0") => {
 if (showDebug) addDebugLog("getLocalLibraryVersions", `libraryName: ${libraryName}` , "");
   const currentDirectory = process.cwd();