@pega/custom-dx-components 0.25.26 → 0.25.27

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

@@ -20,6 +20,7 @@ import {
   checkAccessTokenExpiration,
   getConfigDefaults,
   getLibraryBased,
+  getLibraryBasedCL,
   unZipFromArchive,
   zipVersionAndArchive,
   getLibraryArchiveDirectories,
@@ -28,7 +29,8 @@ import {
   hasArchives,
   restoreFromArchive,
   forceDefaultsUpdate,
-  getLibraryBasedCL
+  getUseInputConfig,
+  getInputConfigForCommand
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
 import { getFilePathQuestions, getFileNameQuestions, updateTempArchive, updateSavedFilePath, getServerOrDirectoryQuestion, getLibraryArchiveQuestion, getServerLibraryArchives, getServerLibraryArchive  } from './helper.js';
@@ -646,6 +648,7 @@ export default async options => {
   await checkPathAccess(pegaConfigJsonPath);
   const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
+  const useInputConfig = getUseInputConfig();
 
   if (!isLibraryBased) {
     console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`)
@@ -669,150 +672,187 @@ export default async options => {
   }
   else {
 
-    inquirer.registerPrompt('fuzzypath', inquirerFuzzyPath);
+    if (useInputConfig) {
+      const inputConfig = await getInputConfigForCommand("importLibVersion");
+      const filePath = inputConfig.fileLocation;
+      const fileName = inputConfig.fileName;
 
-    let importFrom = "Directory";
 
-    if (isLibraryBasedCL) {
-      const localOrServerQuestion = await getServerOrDirectoryQuestion();
-      const localOrServerAnswer = await inquirer.prompt(localOrServerQuestion);
-      ({importFrom} = localOrServerAnswer);
+      console.log("");
+
+      const tasks = new Listr(
+        [
+          {
+            title: `Importing archive`,
+            task: async () => {
+              await importArch( filePath, fileName, hasArch);
+            }
+          }
+        ],
+        { concurrent: false, exitOnError: true }
+      );
+
+
+      await tasks.run().catch(err => {
+        console.log(chalk.bold.red(err.toString()));
+        process.exit(1);
+      });
+
+      console.log("");
+
+      // reapply to save if changed, because imported task.config may have overriden and we want
+      // to keep what was entered as the latest
+      await updateSavedFilePath(filePath);
+
     }
     else {
-      importFrom = "Directory";
-    }
+      inquirer.registerPrompt('fuzzypath', inquirerFuzzyPath);
 
-    if (importFrom === "Server") {
-      await checkAccessTokenExpiration();
+      let importFrom = "Directory";
 
-      let archiveVersions = [];
-      try {
-        archiveVersions = await getServerLibraryArchives();
+      if (isLibraryBasedCL) {
+        const localOrServerQuestion = await getServerOrDirectoryQuestion();
+        const localOrServerAnswer = await inquirer.prompt(localOrServerQuestion);
+        ({importFrom} = localOrServerAnswer);
       }
-      catch (ex) {
-        console.log(chalk.redBright(ex));
+      else {
+        importFrom = "Directory";
       }
 
+      if (importFrom === "Server") {
+        await checkAccessTokenExpiration();
 
-      if (archiveVersions && archiveVersions.pxResults.length > 0) {
-        // ALL option
+        let archiveVersions = [];
+        try {
+          archiveVersions = await getServerLibraryArchives();
+        }
+        catch (ex) {
+          console.log(chalk.redBright(ex));
+        }
 
-        // to name value pairs
-        const archiveResults = archiveVersions["pxResults"].map( archive => ( { value: `${archive.pyApplicationName},${archive.pyFileName},${archive.pyFileType},${archive.pyRuleSet},${archive.pyRuleSetVersion}`, name: `${archive.pyLabel}, ${archive.pyRuleSet}:${archive.pyRuleSetVersion}` }) );
 
+        if (archiveVersions && archiveVersions.pxResults.length > 0) {
+          // ALL option
 
-        const versionQuestions = await getLibraryArchiveQuestion(archiveResults);
-        const versionAnswers = await inquirer.prompt(versionQuestions);
+          // to name value pairs
+          const archiveResults = archiveVersions["pxResults"].map( archive => ( { value: `${archive.pyApplicationName},${archive.pyFileName},${archive.pyFileType},${archive.pyRuleSet},${archive.pyRuleSetVersion}`, name: `${archive.pyLabel}, ${archive.pyRuleSet}:${archive.pyRuleSetVersion}` }) );
 
-        const {archiveData} = versionAnswers;
 
-        if (archiveData != "") {
+          const versionQuestions = await getLibraryArchiveQuestion(archiveResults);
+          const versionAnswers = await inquirer.prompt(versionQuestions);
 
-          const arArchData = archiveData.split(",");
-          let fileName = `${arArchData[1]}.${arArchData[2]}`;
-          let fileData;
+          const {archiveData} = versionAnswers;
 
-          console.log("");
+          if (archiveData != "") {
 
-          const tasks = new Listr(
-            [
-              {
-                title: 'Fetching archive from server',
-                task: async () => {
-                  // get archive
-                  fileData = await getServerLibraryArchive(arArchData[0],arArchData[1], arArchData[2], arArchData[3], arArchData[4]);
-                }
-              },
-              {
-                title: 'Saving archive in store',
-                task: async () => {
-                  await writeZipBuffer(fileName, fileData.pyFileSource);
+            const arArchData = archiveData.split(",");
+            let fileName = `${arArchData[1]}.${arArchData[2]}`;
+            let fileData;
 
-                  // import archive
-                  const currentDirectory = process.cwd();
-                  const tempDirectory = join(currentDirectory, TEMP_PATH);
+            console.log("");
 
-                  await importArchServer( tempDirectory, fileName, hasArch);
+            const tasks = new Listr(
+              [
+                {
+                  title: 'Fetching archive from server',
+                  task: async () => {
+                    // get archive
+                    fileData = await getServerLibraryArchive(arArchData[0],arArchData[1], arArchData[2], arArchData[3], arArchData[4]);
+                  }
+                },
+                {
+                  title: 'Saving archive in store',
+                  task: async () => {
+                    await writeZipBuffer(fileName, fileData.pyFileSource);
+
+                    // import archive
+                    const currentDirectory = process.cwd();
+                    const tempDirectory = join(currentDirectory, TEMP_PATH);
+
+                    await importArchServer( tempDirectory, fileName, hasArch);
+                  }
                 }
-              }
-            ],
-            { concurrent: false, exitOnError: true }
-          );
+              ],
+              { concurrent: false, exitOnError: true }
+            );
 
-          await tasks.run().catch(err => {
-            console.log(chalk.bold.red(err.toString()));
-            process.exit(1);
-          });
+            await tasks.run().catch(err => {
+              console.log(chalk.bold.red(err.toString()));
+              process.exit(1);
+            });
+
+          }
+
+        }
+        else {
+          // No library with that name
+          console.log(chalk.redBright(`No library archives exist on server.`));
+          process.exit(1);
 
         }
 
       }
       else {
-        // No library with that name
-        console.log(chalk.redBright(`No library archives exist on server.`));
-        process.exit(1);
+        let filePathQuestions;
+        try {
+          filePathQuestions = await getFilePathQuestions();
+        }
+        catch (ex) {
+          process.exit(1);
+        }
 
-      }
 
-    }
-    else {
-      let filePathQuestions;
-      try {
-        filePathQuestions = await getFilePathQuestions();
-      }
-      catch (ex) {
-        process.exit(1);
-      }
+        let filePathAnswers;
+        try {
+          filePathAnswers = await inquirer.prompt(filePathQuestions);
+        }
+        catch(ex) {
+          process.exit(1);
+        }
 
+        const { filePath } = filePathAnswers;
+        const zipFileList = await getZipFileList(filePath);
 
-      let filePathAnswers;
-      try {
-        filePathAnswers = await inquirer.prompt(filePathQuestions);
-      }
-      catch(ex) {
-        process.exit(1);
-      }
+        if (!zipFileList || zipFileList.length === 0) {
+          console.log(chalk.red.bold(`No zip files exist at path: ${filePath}`));
+          process.exit();
+        }
 
-      const { filePath } = filePathAnswers;
-      const zipFileList = await getZipFileList(filePath);
+        await updateSavedFilePath(filePath);
 
-      if (!zipFileList || zipFileList.length === 0) {
-        console.log(chalk.red.bold(`No zip files exist at path: ${filePath}`));
-        process.exit();
-      }
+        const fileNameQuestions = await getFileNameQuestions(zipFileList);
+        const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
+        const {fileName} = fileNameAnswers;
 
-      await updateSavedFilePath(filePath);
 
-      const fileNameQuestions = await getFileNameQuestions(zipFileList);
-      const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
-      const {fileName} = fileNameAnswers;
 
-      console.log("");
+        console.log("");
 
-      const tasks = new Listr(
-        [
-          {
-            title: `Importing archive`,
-            task: async () => {
-              await importArch( filePath, fileName, hasArch);
+        const tasks = new Listr(
+          [
+            {
+              title: `Importing archive`,
+              task: async () => {
+                await importArch( filePath, fileName, hasArch);
+              }
             }
-          }
-        ],
-        { concurrent: false, exitOnError: true }
-      );
+          ],
+          { concurrent: false, exitOnError: true }
+        );
 
 
-      await tasks.run().catch(err => {
-        console.log(chalk.bold.red(err.toString()));
-        process.exit(1);
-      });
+        await tasks.run().catch(err => {
+          console.log(chalk.bold.red(err.toString()));
+          process.exit(1);
+        });
 
-      console.log("");
+        console.log("");
 
 
-      // reapply to save if changed, because imported task.config may have overriden and we want
-      // to keep what was entered as the latest
-      await updateSavedFilePath(filePath);
+        // reapply to save if changed, because imported task.config may have overriden and we want
+        // to keep what was entered as the latest
+        await updateSavedFilePath(filePath);
+      }
     }
 
 
@@ -820,6 +860,8 @@ export default async options => {
 
 
 
+
+
   }
 
 addDebugLog("importArchive", "END", "-");

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';
@@ -322,6 +325,7 @@ export default async options => {
   await showVersion();
   await checkLibraryAndArchives();
   await checkPathAccess(pegaConfigJsonPath);
+  const useInputConfig = getUseInputConfig();
 
 addDebugLog("importComponent", "", "+");
 
@@ -342,26 +346,41 @@ addDebugLog("importComponent", "", "+");
   }
   else {
 
-    inquirer.registerPrompt('fuzzypath', inquirerFuzzyPath);
+    let filePath;
+    let fileName;
 
-    const filePathQuestions = await getFilePathQuestions();
-    const filePathAnswers = await inquirer.prompt(filePathQuestions);
-    const { filePath } = filePathAnswers;
+    if (useInputConfig) {
+      const inputConfig = await getInputConfigForCommand("importComponent");
+      filePath = inputConfig.fileLocation;
+      fileName = inputConfig.fileName;
 
-    const compFileList = await getComponentList(filePath);
+      await importComp( filePath, fileName, false);
+    }
+    else {
+      inquirer.registerPrompt('fuzzypath', inquirerFuzzyPath);
+
+      const filePathQuestions = await getFilePathQuestions();
+      const filePathAnswers = await inquirer.prompt(filePathQuestions);
+      const { 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 fileNameQuestions = await getFileNameQuestions(compFileList);
+      const fileNameAnswers = await inquirer.prompt(fileNameQuestions);
+      const {fileName} = fileNameAnswers;
 
-    if (!compFileList || compFileList.length === 0) {
-      console.log(chalk.red.bold(`No component files exist at path: ${filePath}`));
-      process.exit();
+      await importComp( filePath, fileName, true);
     }
 
-    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

@@ -107,7 +107,7 @@
     "@babel/preset-react": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
     "@pega/configs": "^0.16.2",
-    "@pega/custom-dx-components": "~0.25.26",
+    "@pega/custom-dx-components": "~0.25.27",
     "@pega/pcore-pconnect-typedefs": "^4.1.0-alpha.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

package/src/tasks/publish/index.js

@@ -11,6 +11,8 @@ import {
   getPegaServerConfig,
   showVersion,
   getLibraryBased,
+  getLibraryBasedCL,
+  getUseInputConfig,
   addDebugLog,
   updateServerConfigRuleSetAndVersion,
   checkLibraryAndArchives,
@@ -18,7 +20,7 @@ import {
   checkAccessTokenExpiration,
   checkJWTExpiration,
   getConfigDefaults,
-  getLibraryBasedCL } from '../../util.js';
+  getInputConfigForCommand } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 import { default as buildLibrary } from '../build-lib/index.js';
@@ -34,6 +36,8 @@ export default async options => {
   await checkLibraryAndArchives();
   const isLibraryBased = getLibraryBased();
   const isLibraryBasedCL = getLibraryBasedCL();
+  const useInputConfig = getUseInputConfig();
+
 
 addDebugLog("publish", "", "+");
 
@@ -59,23 +63,42 @@ addDebugLog("publish", "", "+");
     console.log();
     console.log(`Publishing to server: ${chalk.green.bold(`${serverConfg.server}`)}`);
 
-    const publishThisVersion = await inquirer.prompt([
-      {
-        name: 'confirmPublish',
-        type: 'confirm',
-        message: `Publish ${chalk.bold.green(`${orgLib.displayLibVersion}`)}, proceed ?`,
-        default: true
+    if (useInputConfig) {
+      const inputConfig = await getInputConfigForCommand("publish");
+
+      // console.log("Input config: ");
+      // console.log(inputConfig);
+
+      if (inputConfig.okToPublish ) {
+        if (devBuild || (!devBuild && inputConfig.okToPublishPermanent)) {
+          okToPublish = true;
+        }
+
       }
-    ]);
 
-    if (publishThisVersion.confirmPublish) {
-      okToPublish = true;
+
+      options.params.push(inputConfig.ruleSetName);
+      options.params.push(inputConfig.ruleSetVersion);
+
     }
+    else {
+      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) {
-      if (options.params.length >= 8) {
+      if (options.params.length >= 8 || useInputConfig) {
         // const rulesetName = options.params[3];
         // const rulesetVersion = options.params[4]
 
@@ -128,6 +151,9 @@ addDebugLog("publish", "", "+");
 
     // end of V2 publishing
     return true;
+
+
+
   }
 
   // otherwise continue with original V1 publishig of individual components

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();