@pega/custom-dx-components 24.2.12 → 24.2.14

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

@@ -18,7 +18,12 @@ import {
   getHaveDependencyDifference,
   forceDefaultsUpdate,
   modAddAboutData,
-  cleanUpTemp
+  cleanUpTemp,
+  getUseInputConfig,
+  getInputConfigForCommand,
+  convertYNToBoolean,
+  hasArchives,
+  hasLibraryAndVersion
 } from '../../util.js';
 
 import { getSwitchVersionComponentQuestions } from './helper.js';
@@ -27,6 +32,8 @@ import { showCurrentStatus } from '../show-status/index.js';
 
 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();
@@ -46,31 +53,79 @@ 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;
+      const permBuild = convertYNToBoolean(isPermanent);
+
+
 
+      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();
+    }
+
+  }
+  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);
+        }
+      }
 
-    okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
+      okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
 
-  } else {
-    const questions = await getSwitchVersionComponentQuestions();
-    const answers = await inquirer.prompt(questions);
-    ({ okToContinue, version } = answers);
+    } 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/tasks/validator/index.js

@@ -315,11 +315,13 @@ const validateOverideSchema = ajv.compile(overrideSchema);
 
 
 export default async (option) => {
-// addDebugLog("validate","", "");
+  // addDebugLog("validate","", "");
 
   let componentToValidate = null;
+  let throwTheError = false;
   if (option.params && option.params[3]) {
     componentToValidate = option.params[3];
+    throwTheError = true;
   } else if (option && option.task === 'validateSchema') {
     const localComponents = await getComponents();
     const answer = await inquirer.prompt({
@@ -332,8 +334,10 @@ export default async (option) => {
     componentToValidate = answer.component;
   } else if (option.name) {
     componentToValidate = option.value;
+    throwTheError = true;
   } else {
     componentToValidate = option;
+    throwTheError = true;
   }
 
   const componentDirectory = await getComponentDirectoryPath(componentToValidate);
@@ -369,13 +373,14 @@ export default async (option) => {
       componentToValidate &&
       !/^[A-Za-z0-9]+_[A-Za-z0-9]+_[A-Za-z0-9]+$/.test(componentToValidate)
     ) {
-      const ootbComponents = await getOOTBComponents();
-      if (ootbComponents.includes(componentToValidate)) {
-        throw new Error(`Invalid: Error occurred in validating ${componentToValidate}`);
-      }
-    }
 
+      if (throwTheError) {
+        throw new Error (`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
 
+      }
+      console.log(`${chalk.redBright(`Error: Invalid name of component '${componentToValidate}' .\n Component name (and component folder) MUST be of the form: 'Org_Lib_ComponentName'.`)}`);
+      process.exit(1);
+    }
 
     console.log(`${chalk.bold.green(componentToValidate)} schema is valid`);
   } else {

package/src/util.js

@@ -20,6 +20,7 @@ import {
   COMPONENTS_DIRECTORY_PATH,
   COMPONENTS_CONFIG_FILE_NAME,
   TASKS_CONFIG_JSON_FILENAME,
+  INPUT_CONFIG_JSON_FILENAME,
   PACKAGE_JSON_FILENAME,
   TOKEN_PATH,
   OOTB_COMPONENT_SERVICE_REST_ENDPOINT,
@@ -29,6 +30,7 @@ import {
   USE_PROMOTED_WEB_PACK,
   BOOTSTRAP_CONFIG,
   LIBRARY_BASED,
+  USE_INPUT_CONFIG,
   SHARED_DIRECTORY,
   SHOW_DEBUG,
   COMPONENTS_PATH,
@@ -62,7 +64,8 @@ let defaultConfigs = {
   displayLibVersion: "",
   showDebug: false,
   importRelativePath: "",
-  exportRelativePath: ""
+  exportRelativePath: "",
+  useInputConfig: false
 };
 
 let pegaConfig = null;
@@ -117,7 +120,8 @@ export const setUpDefaults = async () => {
     displayLibVersion: "",
     showDebug: false,
     importRelativePath: "",
-    exportRelativePath: ""
+    exportRelativePath: "",
+    useInputConfig: false
   };
 
   // retrievedConfigData
@@ -143,6 +147,11 @@ export const setUpDefaults = async () => {
     if (data[LIBRARY_BASED]) {
       retrievedConfigData.isLibraryBased = data[LIBRARY_BASED];
     }
+
+    if (data[USE_INPUT_CONFIG]) {
+      retrievedConfigData.useInputConfig = data[USE_INPUT_CONFIG];
+    }
+
     retrievedConfigData.library = data.component.library;
     retrievedConfigData.version = data.component.version;
 
@@ -172,6 +181,65 @@ 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();
 
@@ -332,6 +400,15 @@ if (showDebug) addDebugLog("getLibraryBased", "", "");
   return defaultConfigs.isLibraryBased;
 }
 
+export const getUseInputConfig = () => {
+if (showDebug) addDebugLog("getUseInputConfig", "", "");
+
+
+  return defaultConfigs.useInputConfig;
+}
+
+
+
 export const setLibraryBased = async (isLibraryBased) => {
 if (showDebug) addDebugLog("setLibraryBased", "", "");
   const currentDirectory = process.cwd();
@@ -563,6 +640,7 @@ if (showDebug) addDebugLog("removeTopLevelConfigFiles", `directory: ${directory}
       if (configF !== "package-lock.json" &&
           configF !== "package.json" &&
           configF !== "tasks.config.json" &&
+          configF !== "input.config.json" &&
           configF !== ".gitignore" &&
           configF !== ".npmrc" &&
           configF !== ".prettierignore") {
@@ -758,6 +836,25 @@ export const getPegaServerConfig = async () => {
 if (showDebug) addDebugLog("getPegaServerConfig", "", "+");
   if (!pegaConfig) {
     pegaConfig = await getPegaConfig();
+
+    if (getServerType() === "launchpad") {
+
+      // need to append isolation id for now
+      let OAuthData;
+      try {
+        OAuthData = fs.readFileSync(TOKEN_PATH, 'utf8');
+      }
+      catch (ex) {
+        return ({});
+      }
+
+      if (OAuthData) {
+        const oOAuthData = JSON.parse(OAuthData);
+        const isolationId = oOAuthData["isolation-ids"].write;
+        pegaConfig['server-config'].isolationId = isolationId[0];
+      }
+
+    }
     sPegaServerConfig = JSON.stringify(pegaConfig['server-config']);
   }