@pega/custom-dx-components 0.242.35 → 0.242.36

package/src/tasks/move/index.js

@@ -7,6 +7,7 @@ import ncp from 'ncp';
 import chalk from 'chalk';
 
 import {
+  sanitize,
   checkPathAccess,
   showVersion,
   getComponentsObj,
@@ -18,7 +19,8 @@ import {
   unZipFromArchive,
   zipVersionAndArchive,
   getLibraryArchivesVersions,
-  getLibraryArchiveDirectories
+  getLibraryArchiveDirectories,
+  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';
@@ -32,7 +34,6 @@ import {
   convertIntoPascalCase,
   getComponentDirectoryPath
 } from '../../util.js';
-import { or } from 'ajv/dist/compile/codegen/index.js';
 
 
 const copy = promisify(ncp);
@@ -42,8 +43,10 @@ export const updateConfig = async (
   {
     oldComponentKey,
     newComponentKey,
+    compName,
     library,
     version,
+    compLabel,
     targetDirectory,
   },
   options,
@@ -60,6 +63,11 @@ addDebugLog("updateConfig", `oldComponentKey: ${oldComponentKey}, newComponentKe
   configData.library = library;
   configData.version = version;
 
+  if (compLabel != "") {
+    configData.label = compLabel;
+    configData.description = compLabel;
+  }
+
   // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
   fs.writeFileSync(join(targetDirectory, "/config.json"), JSON.stringify(configData, null, 4), { encoding: 'utf8' });
 
@@ -91,13 +99,15 @@ export const renameComponent = async (
     library,
     version,
     copyMove,
+    compName = "",
+    compLabel = "",
     options
 ) => {
 
 addDebugLog("renameComponent", `library: ${library}, componentKey: ${componentKey}`, "");
 
-  const componentName = componentKey.split("_")[2];
-  const newComponentKey = `${library}_${componentName}`;
+  // const componentName = componentKey.split("_")[2];
+  const newComponentKey = `${library}_${compName}`;
   const oldComponentKey = componentKey;
   const newComponentKeyPC = convertIntoPascalCase(newComponentKey);
   const oldComponentKeyPC = convertIntoPascalCase(oldComponentKey);
@@ -135,9 +145,10 @@ addDebugLog("renameComponent", `library: ${library}, componentKey: ${componentKe
         {
           oldComponentKey,
           newComponentKey,
-          componentName,
+          compName,
           library,
           version,
+          compLabel,
           targetDirectory,
         },
         options
@@ -169,6 +180,7 @@ export const moveComp = async(componentKey, copyMove, orgLibName, version, copyS
     const archFileName = join(archiveDirectory, fileName);
     const currentCompPath = join(currentDirectory, "src", "components");
     const tempCompPath = join(tempDirectory, "src", "components");
+    const configDef = getConfigDefaults();
 
     await unZipFromArchive(archFileName);
 
@@ -224,6 +236,12 @@ export const moveComp = async(componentKey, copyMove, orgLibName, version, copyS
 
         // rearchive temp directory
         await zipVersionAndArchive(orgLibName, version, tempDirectory);
+
+        // update current /src/components because we copied to it (as well as the archive)
+        if (orgLibName === configDef.currentOrgLib && version === configDef.buildVersion && copyMove === "Copy") {
+          fs.cpSync(join(tempCompPath, newComponentKey), join(currentCompPath, newComponentKey),  { recursive: true, force: true  });
+        }
+
       }
       else {
         console.log(chalk.yellow(`No components were ${copiedOrMoved}`));
@@ -232,20 +250,57 @@ export const moveComp = async(componentKey, copyMove, orgLibName, version, copyS
       // delete temp directory
       fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 5  });
     }
-
-
-
 }
 
 export const localMoveCopyComp = async(componentKey, orgLibName, version, copyMove, currentDirectory, tempDirectory ) => {
     const currentCompPath = join(currentDirectory, "src", "components");
     const tempCompPath = join(tempDirectory, "src", "components");
+    const configDef = getConfigDefaults();
 
     const tempCompName = componentKey.split("_")[2];
-    const newTempComponentKey = `${orgLibName}_${tempCompName}`;
+    let newTempComponentKey = `${orgLibName}_${tempCompName}`;
     const tempDirComp = join(tempCompPath, `${newTempComponentKey}`);
 
-    if (fs.existsSync(tempDirComp)) {
+    let compLabel = "";
+    let compName = tempCompName;
+
+    if (fs.existsSync(join(currentCompPath, componentKey)) && version === configDef.buildVersion && copyMove === "Copy") {
+      // need to rename
+      console.log(`\n${chalk.yellow(`${tempCompName}`)} exists, select new name and label for copied component.`);
+      const nameAnswers = await inquirer.prompt([
+        {
+          name: 'componentName',
+          message: 'Enter component name (required)',
+          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)) {
+              return true;
+            }
+            return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
+          }
+        },
+        {
+          name: 'componentLabel',
+          message: 'Enter component label for display (required)',
+          validate: value => {
+            if (value) {
+              return true;
+            }
+            return 'Please provide value for label';
+          }
+        }
+      ]);
+
+      //
+      compName = nameAnswers.componentName;
+      compLabel = nameAnswers.componentLabel;
+
+    }
+    else if (fs.existsSync(tempDirComp)) {
       const answers = await inquirer.prompt([
         {
           name: 'confirmOverride',
@@ -264,7 +319,7 @@ export const localMoveCopyComp = async(componentKey, orgLibName, version, copyMo
     }
 
     // rename the component
-    const newComponentKey = await renameComponent(componentKey, orgLibName, version, copyMove);
+    const newComponentKey = await renameComponent(componentKey, orgLibName, version, copyMove, compName, compLabel);
 
     return newComponentKey;
 }
@@ -284,6 +339,8 @@ addDebugLog("move", "", "+");
     process.exit();
   }
 
+  await cleanUpTemp();
+
   let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
   data = data && JSON.parse(data);
 
@@ -303,6 +360,8 @@ addDebugLog("move", "", "+");
 
   let localComponents = await getComponentsObj();
 
+  const configDef = getConfigDefaults();
+
   if (!localComponents || localComponents.length === 0 ) {
     console.log(chalk.red.bold("No components to move/copy."));
     process.exit();
@@ -343,7 +402,8 @@ addDebugLog("move", "", "+");
     let removeOrgLib = "";
     let libVersions;
     try {
-      libVersions = await getLibraryArchivesVersions(configDef.currentOrgLib, configDef.buildVersion);
+      // libVersions = await getLibraryArchivesVersions(configDef.currentOrgLib, configDef.buildVersion);
+      libVersions = await getLibraryArchivesVersions(configDef.currentOrgLib, "0.0.0");
     }
     catch (ex) {}
     if (!libVersions || libVersions.length === 0) {
@@ -371,10 +431,11 @@ addDebugLog("move", "", "+");
     ({copyMove} = copyMoveAnswer);
     copyMoveLC = copyMove.toLowerCase();
 
-    if (localComponents && localComponents.length > 1) {
+    if (localComponents && localComponents.length > 1 ) {
       localComponents.unshift({name: 'ALL', value: 'ALL'});
     }
 
+
     const keyQuestions = await getComponentKeyQuestion(localComponents, copyMoveLC, paramComponentKey);
 
     const answers = await inquirer.prompt(keyQuestions);
@@ -387,12 +448,20 @@ addDebugLog("move", "", "+");
     orgLibName = libAnswers.libraryName;
     const buildVersion = configDef.currentOrgLib === orgLibName ? configDef.buildVersion : "";
 
-    try {
-      libVersions = await getLibraryArchivesVersions(orgLibName, buildVersion);
+    // can copy (will rename) to same version, but can't move
+    if (copyMove === "Move") {
+      try {
+        libVersions = await getLibraryArchivesVersions(orgLibName, buildVersion);
+      }
+      catch (ex) {}
+    }
+
+    if (libVersions.length == 0) {
+      console.log(`Current library: ${chalk.green(`${orgLibName}`)} has NO available versions to move to.`);
+      process.exit();
     }
-    catch (ex) {}
 
-    const versionQuestions = await getLibraryVersionQuestion(orgLibName, libVersions);
+    const versionQuestions = await getLibraryVersionQuestion(orgLibName, libVersions, copyMoveLC);
     const versionAnswers = await inquirer.prompt(versionQuestions);
     ({version, copyShared} = versionAnswers);
 

package/src/tasks/publish/helper.js

@@ -119,11 +119,14 @@ addDebugLog("zipComponent", `componentKey: ${componentKey}`, "");
 
   const configContent = Buffer.from(fs.readFileSync(configJson)).toString();
 
-  fs.rm('dist', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  if (fs.existsSync('dist')) {
+    fs.rm('dist', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
+
 
   return { zipContent, configContent };
 };

package/src/tasks/publish/index.js

@@ -17,6 +17,8 @@ export default async options => {
   await checkLibraryAndArchives();
   const isLibraryBased = getLibraryBased();
 
+addDebugLog("publish", "", "+");
+
   if (isLibraryBased) {
 
     await checkJWTExpiration();
@@ -61,7 +63,7 @@ export default async options => {
     }
 
     if (okToPublish) {
-      // marking as intenral, so no questions will be ask
+      // marking as internal, so no questions will be ask
       options.params.push("internal");
 
       await buildLibrary(options);
@@ -72,9 +74,7 @@ export default async options => {
   }
 
 
-
-addDebugLog("publish", "", "+");
-
+  // non library based publish
   let componentKey;
   let sourceMap;
   let devBuild;

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

@@ -109,17 +109,23 @@ addDebugLog("zipComponent", `componentKey: ${componentKey}`, "");
 
 export const cleanUp = async () => {
 addDebugLog("cleanUp", "", "");
-  fs.rm('dist/components', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
 
-  fs.rm('lib', { recursive: true }, err => {
-    if (err) {
-      throw err;
-    }
-  });
+  if (fs.existsSync('dist/components')) {
+    fs.rm('dist/components', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
+
+  if (fs.existsSync('lib')) {
+    fs.rm('lib', { recursive: true }, err => {
+      if (err) {
+        throw err;
+      }
+    });
+  }
+
 };
 
 export const publishComponentToServer = async (data, doFetch) => {

package/src/tasks/quarantine/index.js

@@ -0,0 +1,84 @@
+import fs from 'fs';
+import path, {join} from 'path';
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+
+
+import {
+  showVersion,
+  addDebugLog,
+  getJestFunctionalTestList } from '../../util.js';
+
+import { JEST_TESTS_FUNCTIONAL_PATH } from '../../constants.js';
+
+
+export const quarnUnquarnTests = async(answers) => {
+  switch (answers.QuarUnQuar) {
+    case "Quarantine" :
+      await quarantineTests(answers);
+      break;
+    case "Unquarantine" :
+      await unquarantineTests(answers);
+      break;
+  }
+}
+
+
+
+export const quarantineTests = async(answers) => {
+  const testList = await getJestFunctionalTestList(answers.whichTests);
+  const functionalPath = join(path.resolve(), JEST_TESTS_FUNCTIONAL_PATH);
+
+  // rename .test to .notest
+  for (const testName of testList) {
+    const quarantineName = testName.replace(".test", ".notest");
+    fs.renameSync(join(functionalPath, testName), join(functionalPath, quarantineName));
+  }
+
+}
+
+export const unquarantineTests = async(answers) => {
+  const testList = await getJestFunctionalTestList(answers.whichTests);
+  const functionalPath = join(path.resolve(), JEST_TESTS_FUNCTIONAL_PATH);
+
+  // rename .test to .notest
+  for (const testName of testList) {
+    const restoreName = testName.replace(".notest", ".test");
+    fs.renameSync(join(functionalPath, testName), join(functionalPath, restoreName));
+  }
+
+}
+
+
+export default async options => {
+
+addDebugLog("quarantine", "", "+");
+
+  await showVersion();
+
+  const quaranAnswers = await inquirer.prompt([
+
+    {
+      name: 'QuarUnQuar',
+      type: 'rawlist',
+      message: `Quarantine or UnQuarantine tests`,
+      choices: ["Quarantine", "Unquarantine"],
+      default: 'Quarantine'
+
+    },
+    {
+      name: 'whichTests',
+      type: 'rawlist',
+      message: (answers) => `Which tests to ${answers.QuarUnQuar}`,
+      default: 'ALL',
+      choices: ["ALL", "Original", "Library"]
+    }
+  ]);
+
+  // await showCurrentStatus();
+  await quarnUnquarnTests(quaranAnswers);
+
+
+addDebugLog("quarantine", "END", "-");
+
+}

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

@@ -12,7 +12,6 @@ import {
   showVersion,
   getComponentsObj,
   getDirectoryFiles,
-  getPegaServerConfig,
   getLibraryBased,
   deleteLocalLibrary,
   getC11NB2STokenAndStaticServer,

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

@@ -8,8 +8,6 @@ import { WEBPACK_CONFIG_JS_FILENAME } from '../../constants.js';
 
 export const renamePromotedWebPack = async () => {
 addDebugLog("renamePromotedWebPack","", "");
-  // call this function from top level
-  // 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`);

package/src/tasks/set-perm/index.js

@@ -49,11 +49,20 @@ addDebugLog("setPermVersion", `isPerm: ${isPerm}`, "");
 }
 
 
-export const setPermanent = async () => {
+export const setPermanent = async ( inputYN = "" ) => {
 addDebugLog("setPermanent", "", "");
 
   const configDefaults = await getConfigDefaults();
 
+  if (inputYN != "") {
+    const makePerm = (inputYN === 'Y' || inputYN === 'y' || inputYN === true || inputYN === 'true');
+    await setPermVersion(makePerm);
+
+    await forceDefaultsUpdate();
+    await showCurrentStatus();
+    process.exit();
+  }
+
   const isOrNot = configDefaults.devBuild ? "NOT PERMANENT" : "PERMANENT";
 
   console.log(`Currently ${chalk.green(`${configDefaults.displayLibVersion}`)} is ${chalk.yellow(`${isOrNot}`)}.`);
@@ -125,8 +134,15 @@ addDebugLog("setPerm", "", "+");
 
   await showVersion();
   await checkLibraryAndArchives();
+
+  let inputYN = "";
+
+  if (options.params.length >= 4) {
+    inputYN = options.params[3];
+  }
+
   // await showCurrentStatus();
-  await setPermanent();
+  await setPermanent(inputYN);
 
 
 addDebugLog("setPerm", "END", "-");

package/src/tasks/store/index.js

@@ -9,7 +9,8 @@ import {
   checkLibraryAndArchives,
   getConfigDefaults,
   getLibraryBased,
-  zipVersionAndArchive
+  zipVersionAndArchive,
+  cleanUpTemp
  } from '../../util.js';
 
 export default async options => {
@@ -18,6 +19,8 @@ export default async options => {
 
 addDebugLog("storeComponents", "", "+");
 
+  await cleanUpTemp();
+
   const isLibraryBased = getLibraryBased();
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`)

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

@@ -15,7 +15,8 @@ import {
   checkLibraryAndArchives,
   getConfigDefaults,
   forceDefaultsUpdate,
-  getHaveDependencyDifference
+  getHaveDependencyDifference,
+  cleanUpTemp
 } from '../../util.js';
 
 import { getSwitchLibraryComponentQuestions, getSwitchVersionComponentQuestions } from './helper.js';
@@ -31,6 +32,7 @@ export default async options => {
 
   await showVersion();
   await checkLibraryAndArchives();
+  await cleanUpTemp();
 
 addDebugLog("switchLibrary", "", "+");
   let libraryName;

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

@@ -17,7 +17,8 @@ import {
   getConfigDefaults,
   getHaveDependencyDifference,
   forceDefaultsUpdate,
-  modAddAboutData
+  modAddAboutData,
+  cleanUpTemp
 } from '../../util.js';
 
 import { getSwitchVersionComponentQuestions } from './helper.js';
@@ -33,6 +34,7 @@ export default async options => {
 
   await showVersion();
   await checkLibraryAndArchives();
+  await cleanUpTemp();
 
 addDebugLog("switchVersion", "", "+");
   let libraryName;

package/src/util.js

@@ -33,7 +33,8 @@ import {
   SHOW_DEBUG,
   COMPONENTS_PATH,
   ARCHIVES_PATH,
-  TEMP_PATH
+  TEMP_PATH,
+  JEST_TESTS_FUNCTIONAL_PATH
 } from './constants.js';
 
 
@@ -44,6 +45,7 @@ let debugLevel = 1;
 let haveDependencyDifference = false;
 let addAboutData = true;
 
+
 // updated upon start
 let defaultConfigs = {
   serverType: "",
@@ -1311,17 +1313,22 @@ if (showDebug) addDebugLog("deletePublishExtras", `libraryName: ${libraryName},
 
 export const cleanUp = async () => {
 if (showDebug) addDebugLog("cleanUp", "", "");
+  if (fs.existsSync('dist/components')) {
     fs.rm('dist/components', { recursive: true }, err => {
       if (err) {
         throw err;
       }
     });
+  }
 
+  if (fs.existsSync('lib')) {
     fs.rm('lib', { recursive: true }, err => {
       if (err) {
         throw err;
       }
     });
+  }
+
 };
 
 export const getComponentsConfigs = async (compDir = null) => {
@@ -1413,6 +1420,7 @@ if (showDebug) addDebugLog("zipVersionAndArchive", `orgLibName: ${orgLibName}, v
     console.log('Data has been drained');
   });
 
+
   // good practice to catch warnings (ie stat failures and other non-blocking errors)
   archive.on('warning', function(err) {
     if (err.code === 'ENOENT') {
@@ -1436,7 +1444,7 @@ if (showDebug) addDebugLog("zipVersionAndArchive", `orgLibName: ${orgLibName}, v
   // console.log(chalk.green(`component zipped with size: ${Math.ceil(zipBuffer.length / 1024)} KB`));
   // const zipContent = zipBuffer.toString('base64');
 
-
+  return output;
 
 };
 
@@ -1680,6 +1688,7 @@ if (showDebug) addDebugLog("getLibraryArchiveDirectories", "", "");
   const currentDirectory = process.cwd();
   const archiveDirectory = join (currentDirectory, ARCHIVES_PATH);
 
+
   if (!fs.existsSync(archiveDirectory)) {
     return [];
   }
@@ -1764,11 +1773,10 @@ export const deleteLocalArchiveLibrary = async(libraryName) => {
     fs.rmSync(archiveDirectory, { recursive: true });
     console.log(`${chalk.green.bold(libraryName)} is deleted from Local.`);
   } catch (err) {
-    console.log(`${chalk.green.red(`No such file ${libraryName}/${version}`)}`);
-    throw new Error(`No such file ${libraryName}`);
+    console.log(`${chalk.green.red(`No such file ${libraryName}`)}`);
+    // throw new Error(`No such file ${libraryName}`);
   }
 
-
 }
 
 export const deleteLocalArchiveLibraryVersion = async(libraryName, version) => {
@@ -1783,11 +1791,47 @@ export const deleteLocalArchiveLibraryVersion = async(libraryName, version) => {
 
   } catch (err) {
     console.log(`${chalk.green.red(`No such file ${libraryName}/${version}`)}`);
-    throw new Error(`No such file ${libraryName}/${version}`);
+    // throw new Error(`No such file ${libraryName}/${version}`);
   }
 
 }
 
+export const cleanUpTemp = async() => {
+  const currentDirectory = process.cwd();
+  const tempDirectory = join (currentDirectory, TEMP_PATH);
+
+  if (fs.existsSync(tempDirectory)) {
+    fs.rmSync(tempDirectory, { recursive: true });
+  }
+
+}
+
+
+export const getJestFunctionalTestList = async(whichTests) => {
+  const functionalDir = path.join(path.resolve(), JEST_TESTS_FUNCTIONAL_PATH);
+  const libFilter = "localLib";
+
+  switch (whichTests) {
+    case "ALL" :
+      return fs
+      .readdirSync(functionalDir, { withFileTypes: true })
+      .filter(dirent => !dirent.isDirectory() )
+      .map(dirent => dirent.name);
+    case "Original":
+      return fs
+      .readdirSync(functionalDir, { withFileTypes: true })
+      .filter(dirent => !dirent.isDirectory() && !dirent.name.startsWith(libFilter))
+      .map(dirent => dirent.name);
+    case "Library" :
+      return fs
+      .readdirSync(functionalDir, { withFileTypes: true })
+      .filter(dirent => !dirent.isDirectory() && dirent.name.startsWith(libFilter))
+      .map(dirent => dirent.name);
+  }
+
+
+}
+
 
 // init
 await forceDefaultsUpdate();