@pega/custom-dx-components 0.25.26 → 0.25.28

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

@@ -11,6 +11,8 @@ import {
   setConfigDevBuild,
   updateConfigVersion,
   checkLibraryAndArchives,
+  getUseInputConfig,
+  getInputConfigForCommand,
   forceDefaultsUpdate } from '../../util.js';
 import { showCurrentStatus } from '../show-status/index.js';
 
@@ -124,6 +126,8 @@ addDebugLog("setPermanent", "", "");
 
 export default async options => {
   const isLibraryBased =  getLibraryBased();
+  const useInputConfig = getUseInputConfig();
+
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`);
     process.exit();
@@ -135,8 +139,17 @@ addDebugLog("setPerm", "", "+");
 
   let inputYN = "";
 
-  if (options.params.length >= 4) {
-    inputYN = options.params[3];
+  if (useInputConfig) {
+    const inputConfig = await getInputConfigForCommand("setPermanent");
+    inputYN = inputConfig.makePermanent;
+
+  }
+  else {
+
+    if (options.params.length >= 4) {
+      inputYN = options.params[3];
+    }
+
   }
 
   // await showCurrentStatus();

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

@@ -17,7 +17,12 @@ import {
   forceDefaultsUpdate,
   getHaveDependencyDifference,
   cleanUpTemp,
-  getLibraryArchiveDirectories
+  getLibraryArchiveDirectories,
+  getUseInputConfig,
+  getInputConfigForCommand,
+  convertYNToBoolean,
+  hasArchives,
+  getLibraryBasedCL
 } from '../../util.js';
 
 import { getSwitchLibraryComponentQuestions, getSwitchVersionComponentQuestions } from './helper.js';
@@ -27,6 +32,10 @@ import { arch } from 'os';
 
 export default async options => {
   const isLibraryBased =  getLibraryBased();
+  const isLibraryBasedCL = getLibraryBasedCL();
+
+  const useInputConfig = getUseInputConfig();
+
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`);
     process.exit();
@@ -47,58 +56,102 @@ addDebugLog("switchLibrary", "", "+");
 
   const currentDirectory = process.cwd();
   const componentDirectory = join (currentDirectory, "src", "components");
+  const orgLib = getConfigDefaults();
 
-  // params are in different order then questions, because want of VS Code pluggin
-  if (options.params.length >= 6) {
-    newOrgLib = options.params[3];
-    version = options.params[4];
-
-    const okToCont = options.params[5];
-    okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
+  // if we have choosen to use INPUT CONFIG FILE
+  // process and no inputs
+  if (useInputConfig) {
+    const inputConfig = await getInputConfigForCommand("switchLib");
+
+    if (convertYNToBoolean(inputConfig.okToContinue)) {
+      const newLibraryName = inputConfig.libraryName;
+      newOrgLib = `${orgLib.organization}_${newLibraryName}`;
+      version = inputConfig.libraryVersion;
+      const isPermanent = inputConfig.isPermanent;
+      let permBuild = convertYNToBoolean(isPermanent);
+
+      if (isLibraryBasedCL) {
+        // no -dev for PegaInfinity
+        permBuild = true;
+      }
 
+      const hasArch = await hasArchives();
+      if (hasArch) {
+        if (orgLib.currentOrgLib === newOrgLib) {
+          console.log(`${chalk.bold.red(`Your current library is already ${orgLib.displayLibVersion}`)}`);
+          process.exit();
+        }
+      }
+      else {
+        console.log(`${chalk.bold.red(`No libraries exist.`)}`);
+        console.log("You need to create a library first via 'npm run createLib'.\n")
+        process.exit();
+      }
 
-  } else {
+      // version here includes -dev if appropriate
+      if (!permBuild) {
+        version = version.concat("-dev");
+      }
 
-    if (options.params.length >= 5) {
-      inputOrgLib = options.params[3];
-      version = options.params[4];
     }
-    else if (options.params.length >= 4) {
-      inputOrgLib = options.params[3];
+    else {
+      process.exit();
     }
 
-    const orgLib = getConfigDefaults();
+  }
+  else {
+    // params are in different order then questions, because want of VS Code pluggin
+    if (options.params.length >= 6) {
+      newOrgLib = options.params[3];
+      version = options.params[4];
 
-    const archVersionList = await getLibraryArchiveDirectories(orgLib.currentOrgLib);
-    if (archVersionList.length === 0) {
-      console.log(chalk.red(`No other available libraries to switch to.`));
-      process.exit();
-    }
+      const okToCont = options.params[5];
+      okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
 
 
-    const questions = await getSwitchLibraryComponentQuestions(archVersionList, inputOrgLib);
-    const answers = await inquirer.prompt(questions);
-    ({ okToContinue, newOrgLib } = answers);
+    } else {
 
-    if (!answers.okToContinue) {
-      process.exit()
-    }
+      if (options.params.length >= 5) {
+        inputOrgLib = options.params[3];
+        version = options.params[4];
+      }
+      else if (options.params.length >= 4) {
+        inputOrgLib = options.params[3];
+      }
 
-    if (newOrgLib === ""|| newOrgLib === undefined ) {
-      newOrgLib = inputOrgLib;
-    }
+      const orgLib = getConfigDefaults();
+
+      const archVersionList = await getLibraryArchiveDirectories(orgLib.currentOrgLib);
+      if (archVersionList.length === 0) {
+        console.log(chalk.red(`No other available libraries to switch to.`));
+        process.exit();
+      }
 
-    if (version === "" || version === undefined) {
-      const nextQuestion = await getSwitchVersionComponentQuestions(newOrgLib);
-      const nextAnswers = await inquirer.prompt(nextQuestion);
-      ({ version } = nextAnswers);
-    }
 
+      const questions = await getSwitchLibraryComponentQuestions(archVersionList, inputOrgLib);
+      const answers = await inquirer.prompt(questions);
+      ({ okToContinue, newOrgLib } = answers);
+
+      if (!answers.okToContinue) {
+        process.exit()
+      }
+
+      if (newOrgLib === ""|| newOrgLib === undefined ) {
+        newOrgLib = inputOrgLib;
+      }
+
+      if (version === "" || version === undefined) {
+        const nextQuestion = await getSwitchVersionComponentQuestions(newOrgLib);
+        const nextAnswers = await inquirer.prompt(nextQuestion);
+        ({ version } = nextAnswers);
+      }
+
+    }
   }
 
-  // in this scenario, version contains "-dev", if appropriate
 
-  const orgLib = getConfigDefaults();
+
+  // in this scenario, version contains "-dev", if appropriate
   const newVersion = version;
   const existingOrgLib = orgLib.currentOrgLib;
   let oldVersion = orgLib.buildVersion;

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

@@ -10,6 +10,7 @@ import {
   showVersion,
   getPegaServerConfig,
   getLibraryBased,
+  getLibraryBasedCL,
   addDebugLog,
   zipVersionAndArchive,
   restoreFromArchive,
@@ -18,7 +19,12 @@ import {
   getHaveDependencyDifference,
   forceDefaultsUpdate,
   modAddAboutData,
-  cleanUpTemp
+  cleanUpTemp,
+  getUseInputConfig,
+  getInputConfigForCommand,
+  convertYNToBoolean,
+  hasArchives,
+  hasLibraryAndVersion
 } from '../../util.js';
 
 import { getSwitchVersionComponentQuestions } from './helper.js';
@@ -27,6 +33,9 @@ import { showCurrentStatus } from '../show-status/index.js';
 
 export default async options => {
   const isLibraryBased =  getLibraryBased();
+  const isLibraryBasedCL = getLibraryBasedCL();
+
+  const useInputConfig = getUseInputConfig();
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`);
     process.exit();
@@ -46,31 +55,82 @@ addDebugLog("switchVersion", "", "+");
   const serverConfig = await getPegaServerConfig();
   const currentDirectory = process.cwd();
   const componentDirectory = join (currentDirectory, "src", "components");
+  const orgLib = getConfigDefaults();
+
+
+   // if we have choosen to use INPUT CONFIG FILE
+  // process and no inputs
+  if (useInputConfig) {
+    const inputConfig = await getInputConfigForCommand("switchLibVersion");
+
+    okToContinue = convertYNToBoolean(inputConfig.okToContinue);
+    if (okToContinue) {
+      version = inputConfig.libraryVersion;
+      const isPermanent = inputConfig.isPermanent;
+      let permBuild = convertYNToBoolean(isPermanent);
+
+      if (isLibraryBasedCL) {
+        // no -dev for PegaInfinity
+        permBuild = true;
+      }
 
+      const hasArch = await hasArchives();
+      const orgLib = getConfigDefaults();
+      const hasLib = await hasLibraryAndVersion(orgLib.library, version, !permBuild);
 
-  if (options.params.length >= 5) {
-    const okToCont = options.params[3];
-    version = options.params[4];
+      // version here includes -dev if appropriate
+      if (!permBuild) {
+        version = version.concat("-dev");
+      }
 
-    // if have [5] will be "NoAbout" from Jest, to turn off build date
-    if (options.params.length >= 6 ) {
-      if (options.params[5] === "NoAbout") {
-        modAddAboutData(false);
+      if (hasArch) {
+        if (orgLib.buildVersion == version ) {
+          console.log(`${chalk.bold.red(`Your current library/version is already ${orgLib.displayLibVersion}.`)}`);
+          process.exit();
+        }
+        if (!hasLib) {
+          console.log(`${chalk.bold.red(`${orgLib.library}/${version} does not exist.`)}`);
+          process.exit();
+        }
+      }
+      else {
+        console.log(`${chalk.bold.red(`No libraries exist.`)}`);
+        console.log("You need to create a library first via 'npm run createLib'.\n")
+        process.exit();
       }
+
+    }
+    else {
+      process.exit();
     }
 
-    okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
+  }
+  else {
+    if (options.params.length >= 5) {
+      const okToCont = options.params[3];
+      version = options.params[4];
+
+      // if have [5] will be "NoAbout" from Jest, to turn off build date
+      if (options.params.length >= 6 ) {
+        if (options.params[5] === "NoAbout") {
+          modAddAboutData(false);
+        }
+      }
 
-  } else {
-    const questions = await getSwitchVersionComponentQuestions();
-    const answers = await inquirer.prompt(questions);
-    ({ okToContinue, version } = answers);
+      okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
+
+    } else {
+      const questions = await getSwitchVersionComponentQuestions();
+      const answers = await inquirer.prompt(questions);
+      ({ okToContinue, version } = answers);
+    }
   }
 
+
   if (okToContinue) {
     // in this scenario, version contains "-dev", if appropriate
 
-    const orgLib = getConfigDefaults();
+
     const newVersion = version;
     const existingOrgLib = orgLib.currentOrgLib;
     const oldVersion = orgLib.buildVersion;

package/src/util.js

@@ -21,6 +21,7 @@ import {
   COMPONENTS_DIRECTORY_PATH,
   COMPONENTS_CONFIG_FILE_NAME,
   TASKS_CONFIG_JSON_FILENAME,
+  INPUT_CONFIG_JSON_FILENAME,
   PACKAGE_JSON_FILENAME,
   PACKAGE_LOCK_JSON_FILENAME,
   TOKEN_PATH,
@@ -33,6 +34,7 @@ import {
   BOOTSTRAP_CONFIG,
   LIBRARY_BASED,
   LIBRARY_BASED_CL,
+  USE_INPUT_CONFIG,
   SHARED_DIRECTORY,
   SHOW_DEBUG,
   COMPONENTS_PATH,
@@ -69,7 +71,8 @@ let defaultConfigs = {
   displayLibVersion: "",
   showDebug: false,
   importRelativePath: "",
-  exportRelativePath: ""
+  exportRelativePath: "",
+  useInputConfig: false
 };
 
 let pegaConfig = null;
@@ -125,7 +128,8 @@ export const setUpDefaults = async () => {
     displayLibVersion: "",
     showDebug: false,
     importRelativePath: "",
-    exportRelativePath: ""
+    exportRelativePath: "",
+    useInputConfig: false
   };
 
   // retrievedConfigData
@@ -143,14 +147,18 @@ export const setUpDefaults = async () => {
       retrievedConfigData.importRelativePath = data[IMPORT_RELATIVE_PATH];
     }
 
-
     if (data[EXPORT_RELATIVE_PATH]) {
       retrievedConfigData.exportRelativePath = data[EXPORT_RELATIVE_PATH];
     }
 
+    if (data[USE_INPUT_CONFIG]) {
+      retrievedConfigData.useInputConfig = data[USE_INPUT_CONFIG];
+    }
+
     if (data[LIBRARY_BASED]) {
       retrievedConfigData.isLibraryBased = data[LIBRARY_BASED];
     }
+
     retrievedConfigData.library = data.component.library;
     retrievedConfigData.version = data.component.version;
 
@@ -189,6 +197,63 @@ export const setUpDefaults = async () => {
   return JSON.parse(JSON.stringify(retrievedConfigData));
 }
 
+export const convertYNToBoolean = (inputYN) => {
+  switch (inputYN) {
+    case 'Y':
+    case 'y':
+    case 'Yes':
+    case 'YES':
+    case 't':
+    case 'true':
+    case 'True':
+    case 'TRUE':
+      return true;
+  }
+
+  return false;
+}
+
+export const getInputConfigForCommand = async (commandName) => {
+  // retrievedConfigData
+  const currentDirectory = process.cwd();
+  const inputConfigJsonPath = join(currentDirectory, INPUT_CONFIG_JSON_FILENAME);
+  const isLibraryBased = getLibraryBased();
+
+  try {
+    // force to throw error and not console log
+    await checkPathAccess(inputConfigJsonPath, {}, true);
+
+    let data = fs.readFileSync(inputConfigJsonPath, { encoding: 'utf8' });
+    data = JSON.parse(data);
+
+    if (isLibraryBased) {
+      const libraryCommands = data["libraryMode"];
+
+      if (libraryCommands[commandName]) {
+        return libraryCommands[commandName];
+
+      }
+    }
+    else {
+      const standardCommands = data["standard"];
+
+      if (standardCommands[commandName]) {
+        return standardCommands[commandName];
+
+      }
+
+    }
+  }
+  catch (ex) {
+    // when can't find it, always be false, assume no library based.
+    // This is IMPORTANT for init (npx install)
+    return {};
+  }
+
+  return {};
+
+}
+
 // initialize
 // await setUpDefaults();
 
@@ -410,6 +475,13 @@ if (showDebug) addDebugLog("getLibraryBasedCL", "", "");
   return defaultConfigs.isLibraryBasedCL;
 }
 
+export const getUseInputConfig = () => {
+if (showDebug) addDebugLog("getUseInputConfig", "", "");
+
+
+  return defaultConfigs.useInputConfig;
+}
+
 export const setLibraryBased = async (isLibraryBased) => {
 if (showDebug) addDebugLog("setLibraryBased", "", "");
   const currentDirectory = process.cwd();