@pega/custom-dx-components 24.2.12 → 24.2.13

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

@@ -14,7 +14,10 @@ import {
   addDebugLog,
   checkLibraryAndArchives,
   getConfigDefaults,
-  getComponents
+  getComponents,
+  getUseInputConfig,
+  getInputConfigForCommand,
+  convertYNToBoolean
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME } from '../../constants.js';
 import { getFilePathQuestions, getFileNameQuestions, updateSavedFilePath  } from './helper.js';
@@ -156,6 +159,8 @@ addDebugLog("renameComponent", `library: ${library}, componentKey: ${componentKe
 export const importComp = async(filePath, fileName, askValidate) => {
 addDebugLog("importComp", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
+  const useInputConfig = getUseInputConfig();
+
   const currentDirectory = process.cwd();
   // const compDirectory = join(currentDirectory, "src", "components");
 
@@ -166,6 +171,8 @@ addDebugLog("importComp", `filePath: ${filePath}, fileName: ${fileName}`, "");
   let configData;
   let newName = "";
   let newLabel = "";
+  let proceedAs;
+
 
   if (fs.existsSync(copyDir)) {
     configData = fs.readFileSync(join(copyDir, "/config.json"), { encoding: 'utf8' });
@@ -178,66 +185,96 @@ addDebugLog("importComp", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
     if (currentCompList && currentCompList.includes(potentialCompKey)) {
       console.log(`\nComponent ${chalk.yellow(`${potentialCompKey}`)} already exists.`);
-      const proceedAnswers = await inquirer.prompt([
 
-        {
-          name: 'proceedAs',
-          type: 'rawlist',
-          message: `Proceed as ?`,
-          default: 'No import',
-          choices: ['No import', 'Overwrite', 'New name']
-        },
-        {
-          name: 'componentName',
-          message: 'Enter component name (required)',
-          when(answers) {
-            return answers.proceedAs === 'New name';
+
+
+      if (useInputConfig) {
+        const inputConfig = await getInputConfigForCommand("importComponent");
+        proceedAs = inputConfig.proceedIfExists;
+
+        newName = inputConfig?.newComponentName;
+        newLabel = inputConfig?.newComponentLabel;
+
+
+        switch (proceedAs) {
+          case 'No import':
+            // removed copied
+            // fs.rmSync(copyDir, { recursive: true, force: true, maxRetries: 2 });
+            process.exit();
+            break;
+          case 'Overwrite':
+            // remove existing
+            const existingComp = await getComponentDirectoryPath(potentialCompKey);
+            fs.rmSync(existingComp, { recursive: true, force: true, maxRetries: 2 });
+            break;
+        }
+
+      }
+      else {
+        const proceedAnswers = await inquirer.prompt([
+
+          {
+            name: 'proceedAs',
+            type: 'rawlist',
+            message: `Proceed as ?`,
+            default: 'No import',
+            choices: ['No import', 'Overwrite', 'New 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)) {
-              return true;
+          {
+            name: 'componentName',
+            message: 'Enter component name (required)',
+            when(answers) {
+              return answers.proceedAs === 'New 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)) {
+                return true;
+              }
+              return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
             }
-            return 'Only alphanumeric values are allowed, starting with alphabets, no spaces.';
-          }
-        },
-        {
-          name: 'componentLabel',
-          message: 'Enter component label for display (required)',
-          when(answers) {
-            return answers.proceedAs === 'New name';
           },
-          validate: value => {
-            if (value) {
-              return true;
+          {
+            name: 'componentLabel',
+            message: 'Enter component label for display (required)',
+            when(answers) {
+              return answers.proceedAs === 'New name';
+            },
+            validate: value => {
+              if (value) {
+                return true;
+              }
+              return 'Please provide value for label';
             }
-            return 'Please provide value for label';
           }
+        ]);
+
+        proceedAs = proceedAnswers.proceedAs;
+
+        switch (proceedAs) {
+          case 'No import':
+            // removed copied
+            // fs.rmSync(copyDir, { recursive: true, force: true, maxRetries: 2 });
+            process.exit();
+            break;
+          case 'Overwrite':
+            // remove existing
+            const existingComp = await getComponentDirectoryPath(potentialCompKey);
+            fs.rmSync(existingComp, { recursive: true, force: true, maxRetries: 2 });
+            break;
+          case 'New name':
+            newName = proceedAnswers.componentName;
+            newLabel = proceedAnswers.componentLabel;
+            break;
         }
-      ]);
-
-
-      switch (proceedAnswers.proceedAs) {
-        case 'No import':
-          // removed copied
-          // fs.rmSync(copyDir, { recursive: true, force: true, maxRetries: 2 });
-          process.exit();
-          break;
-        case 'Overwrite':
-          // remove existing
-          const existingComp = await getComponentDirectoryPath(potentialCompKey);
-          fs.rmSync(existingComp, { recursive: true, force: true, maxRetries: 2 });
-          break;
-        case 'New name':
-          newName = proceedAnswers.componentName;
-          newLabel = proceedAnswers.componentLabel;
-          break;
       }
 
+
+
     }
   }
 
@@ -251,30 +288,39 @@ addDebugLog("importComp", `filePath: ${filePath}, fileName: ${fileName}`, "");
     console.log(`\n${chalk.green(`${fileName}`)} has been imported as ${chalk.green(`${newCompKey}`)}\n`);
 
     if (askValidate) {
-      const validateAnswers = await inquirer.prompt([
-        {
-          name: 'doValidate',
-          type: 'confirm',
-          message: `Validate ${chalk.yellow(`${newCompKey}`)}`,
-          default: true
-        }]);
-
-      if (validateAnswers.doValidate) {
-        const args  = [ '','', '', `${newCompKey}`];
-        let myOptions = {};
-        myOptions["params"] = args;
-
-        await buildComponent(myOptions);
-      }
-    }
-
-
 
+      if (useInputConfig) {
+        const inputConfig = await getInputConfigForCommand("importComponent");
+        if (convertYNToBoolean(inputConfig.doValidation)) {
+          const args  = [ '','', '', `${newCompKey}`];
+          let myOptions = {};
+          myOptions["params"] = args;
 
-  }
+          await buildComponent(myOptions);
+        }
 
+      }
+      else {
+        const validateAnswers = await inquirer.prompt([
+          {
+            name: 'doValidate',
+            type: 'confirm',
+            message: `Validate ${chalk.yellow(`${newCompKey}`)}`,
+            default: true
+          }]);
+
+        if (validateAnswers.doValidate) {
+          const args  = [ '','', '', `${newCompKey}`];
+          let myOptions = {};
+          myOptions["params"] = args;
+
+          await buildComponent(myOptions);
+        }
+      }
 
+    }
 
+  }
 
 }
 
@@ -321,6 +367,8 @@ export default async options => {
   await checkLibraryAndArchives();
   await checkPathAccess(pegaConfigJsonPath);
 
+  const useInputConfig = getUseInputConfig();
+
 addDebugLog("importComponent", "", "+");
 
   if (options.params.length >= 5) {
@@ -340,22 +388,36 @@ addDebugLog("importComponent", "", "+");
   }
   else {
 
-    const filePathQuestions = await getFilePathQuestions();
-    const filePathAnswers = await inquirer.prompt(filePathQuestions);
-    const { filePath } = filePathAnswers;
+    let filePath;
+    let fileName;
+
+    if (useInputConfig) {
+      const inputConfig = await getInputConfigForCommand("importComponent");
+      filePath = inputConfig.fileLocation;
+      fileName = inputConfig.fileName;
+
+    }
+    else {
+      const filePathQuestions = await getFilePathQuestions();
+      const filePathAnswers = await inquirer.prompt(filePathQuestions);
+      ({ filePath } = filePathAnswers);
+
+      const compFileList = await getComponentList(filePath);
+
+      if (!compFileList || compFileList.length === 0) {
+        console.log(chalk.red.bold(`No component files exist at path: ${filePath}`));
+        process.exit();
+      }
+
+      await updateSavedFilePath(filePath);
 
-    const compFileList = await getComponentList(filePath);
+      const fileNameQuestions = await getFileNameQuestions(compFileList);
+      const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
+      ({fileName} = fileNameAnswers);
 
-    if (!compFileList || compFileList.length === 0) {
-      console.log(chalk.red.bold(`No component files exist at path: ${filePath}`));
-      process.exit();
     }
 
-    await updateSavedFilePath(filePath);
 
-    const fileNameQuestions = await getFileNameQuestions(compFileList);
-    const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
-    const {fileName} = fileNameAnswers;
 
     await importComp( filePath, fileName, true);
 

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

@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~24.2.12",
+    "@pega/custom-dx-components": "~24.2.13",
     "@pega/pcore-pconnect-typedefs": "3.2.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

package/src/tasks/publish/index.js

@@ -6,7 +6,7 @@ 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, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives, getConfigDevBuild, checkJWTExpiration, getConfigDefaults } from '../../util.js';
+import { getComponentDirectoryPath, showVersion, getLibraryBased, getUseInputConfig, addDebugLog, getPegaServerConfig, updateServerConfigRuleSetAndVersion, checkLibraryAndArchives, getConfigDevBuild, checkJWTExpiration, getConfigDefaults, getInputConfigForCommand } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 import { default as buildLibrary } from '../build-lib/index.js';
@@ -21,6 +21,7 @@ export default async options => {
   await showVersion();
   await checkLibraryAndArchives();
   const isLibraryBased = getLibraryBased();
+  const useInputConfig = getUseInputConfig();
 
 addDebugLog("publish", "", "+");
 
@@ -37,34 +38,49 @@ addDebugLog("publish", "", "+");
     const currentVersion = orgLib.buildVersion;
 
 
+    if (useInputConfig) {
+      const inputConfig = await getInputConfigForCommand("publish");
+
+      console.log("Input config: ");
+      console.log(inputConfig);
+
+      if (inputConfig.okToPublish ) {
+        if (devBuild || (!devBuild && inputConfig.okToPublishPermanent)) {
+          okToPublish = true;
+        }
 
-    const publishThisVersion = await inquirer.prompt([
-      {
-        name: 'confirmPublish',
-        type: 'confirm',
-        message: `Publish ${chalk.bold.green(`${orgLib.displayLibVersion}`)}, proceed ?`,
-        default: true
       }
-    ]);
 
-    if (publishThisVersion.confirmPublish) {
-      okToPublish = true;
     }
-
-    if (okToPublish && !devBuild) {
-      okToPublish = false;
-      console.log("");
-      const publishAnswers = await inquirer.prompt([
+    else {
+      const publishThisVersion = 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
+          message: `Publish ${chalk.bold.green(`${orgLib.displayLibVersion}`)}, proceed ?`,
+          default: true
         }
       ]);
-      if (publishAnswers.confirmPublish) {
+
+      if (publishThisVersion.confirmPublish) {
         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) {

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

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 
 import validate from '../validator/index.js';
 import { lintComponent } from '../linter/index.js';
-import { getComponentDirectoryPath, showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLibraryBased, deletePublishExtras, addDebugLog, checkLibraryAndArchives, checkJWTExpiration, getConfigDefaults } from '../../util.js';
+import { getComponentDirectoryPath, showVersion, getC11NB2STokenAndStaticServer, getLocalLibraryVersions, getLibraryBased, deletePublishExtras, addDebugLog, checkLibraryAndArchives, checkJWTExpiration, getConfigDefaults, getUseInputConfig, getInputConfigForCommand } from '../../util.js';
 
 import { publishLib, listLibJSONResponse, deleteLibVersion } from '@pega/constellation-dx-components-build-utils/index.js';
 
@@ -178,6 +178,11 @@ addDebugLog("publishLibrary", "", "+");
       ({version} = versionAnswers);
     }
 
+    const useInputConfig = getUseInputConfig();
+    let inputConfig = {};
+    if (useInputConfig) {
+      inputConfig = await getInputConfigForCommand("publish");
+    }
 
     let okToPublish = true;
 
@@ -190,6 +195,8 @@ addDebugLog("publishLibrary", "", "+");
 
     if (!version.includes("-dev") && !internalPublish) {
       okToPublish = false;
+
+
       const publishAnswers = await inquirer.prompt([
 
         {
@@ -204,6 +211,9 @@ addDebugLog("publishLibrary", "", "+");
       }
     }
 
+
+
+
     if (noRealPublish) {
       // this is as far as JEST test can go since need server for rest and don't want to use server.
       console.log("OK to publish.");
@@ -218,8 +228,15 @@ addDebugLog("publishLibrary", "", "+");
 
       await deletePublishExtras(libraryName, version);
 
+      if (useInputConfig) {
+        if (inputConfig.okToOverride) {
+          // to override
+          overrideExisting = true;
+        }
+      }
 
-      if (libVersionExists) {
+
+      if (libVersionExists && !overrideExisting) {
           console.log("\nLibrary " + chalk.bold.yellow(`${libraryName}/${version}`) + " already exists.");
           const questions = [
             {

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

@@ -13,6 +13,8 @@ import {
   setConfigDevBuild,
   updateConfigVersion,
   checkLibraryAndArchives,
+  getUseInputConfig,
+  getInputConfigForCommand,
   forceDefaultsUpdate } from '../../util.js';
 import { showCurrentStatus } from '../show-status/index.js';
 
@@ -126,6 +128,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();
@@ -136,9 +140,17 @@ addDebugLog("setPerm", "", "+");
   await checkLibraryAndArchives();
 
   let inputYN = "";
+  if (useInputConfig) {
+    const inputConfig = await getInputConfigForCommand("setPermanent");
+    inputYN = inputConfig.makePermanent;
+
+  }
+  else {
+
+    if (options.params.length >= 4) {
+      inputYN = options.params[3];
+    }
 
-  if (options.params.length >= 4) {
-    inputYN = options.params[3];
   }
 
   // await showCurrentStatus();

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

@@ -17,7 +17,11 @@ import {
   forceDefaultsUpdate,
   getHaveDependencyDifference,
   cleanUpTemp,
-  getLibraryArchiveDirectories
+  getLibraryArchiveDirectories,
+  getUseInputConfig,
+  getInputConfigForCommand,
+  convertYNToBoolean,
+  hasArchives
 } from '../../util.js';
 
 import { getSwitchLibraryComponentQuestions, getSwitchVersionComponentQuestions } from './helper.js';
@@ -27,6 +31,8 @@ import { arch } from 'os';
 
 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();
@@ -48,61 +54,104 @@ addDebugLog("switchLibrary", "", "+");
   const currentDirectory = process.cwd();
   const componentDirectory = join (currentDirectory, "src", "components");
 
-  // 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 orgLib = getConfigDefaults();
 
-    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");
 
-  } else {
+    if (convertYNToBoolean(inputConfig.okToContinue)) {
+      const newLibraryName = inputConfig.libraryName;
+      newOrgLib = `${orgLib.organization}_${newLibraryName}`;
+      version = inputConfig.libraryVersion;
+      const isPermanent = inputConfig.isPermanent;
+      const permBuild = convertYNToBoolean(isPermanent);
 
-    if (options.params.length >= 5) {
-      inputOrgLib = options.params[3];
-      version = options.params[4];
-    }
-    else if (options.params.length >= 4) {
-      inputOrgLib = options.params[3];
-    }
+      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();
+      }
 
-    const orgLib = getConfigDefaults();
+      // version here includes -dev if appropriate
+      if (!permBuild) {
+        version = version.concat("-dev");
+      }
 
-    const archVersionList = await getLibraryArchiveDirectories(orgLib.currentOrgLib);
-    if (archVersionList.length === 0) {
-      console.log(chalk.red(`No other available libraries to switch to.`));
+    }
+    else {
       process.exit();
     }
 
+  }
+  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 questions = await getSwitchLibraryComponentQuestions(archVersionList, inputOrgLib);
-    const answers = await inquirer.prompt(questions);
-    ({ okToContinue, newOrgLib } = answers);
+      const okToCont = options.params[5];
+      okToContinue = !!(okToCont === 'Y' || okToCont === 'y' || okToCont === true || okToCont === 'true');
 
-    if (!answers.okToContinue) {
-      process.exit()
-    }
 
-    if (newOrgLib === ""|| newOrgLib === undefined ) {
-      newOrgLib = inputOrgLib;
     }
+    else {
 
-    if (version === "" || version === undefined) {
-      const nextQuestion = await getSwitchVersionComponentQuestions(newOrgLib);
-      const nextAnswers = await inquirer.prompt(nextQuestion);
-      ({ version } = nextAnswers);
-    }
+      if (options.params.length >= 5) {
+        inputOrgLib = options.params[3];
+        version = options.params[4];
+      }
+      else if (options.params.length >= 4) {
+        inputOrgLib = options.params[3];
+      }
+
+      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();
+      }
+
+
+      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;
 
+
   const switchToFileName = `${newOrgLib}_${newVersion}.zip`;
 
   console.log("");