@pega/custom-dx-components 0.242.47 → 0.242.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.242.47",
+  "version": "0.242.48",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

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

@@ -294,11 +294,8 @@ export const updateSavedFilePath = async(filePath) => {
     // same starting path, so we can save the relative
     const relativePath = filePath.replace(defaultPath.concat("/"), "");
 
-    if (relativePath != configDef.importRelativePath) {
-      await setConfigImportRelativePath(relativePath);
-      await forceDefaultsUpdate();
-    }
-
+    await setConfigImportRelativePath(relativePath);
+    await forceDefaultsUpdate();
 
   }
 }

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

@@ -5,6 +5,7 @@ import { join } from 'path';
 import inquirer from 'inquirer';
 import ncp from 'ncp';
 import chalk from 'chalk';
+import { Listr } from 'listr2';
 
 import {
   sanitize,
@@ -19,10 +20,14 @@ import {
   zipVersionAndArchive,
   getLibraryArchiveDirectories,
   hasLibraryAndVersion,
-  cleanUpTemp
+  cleanUpTemp,
+  hasArchives,
+  restoreFromArchive,
+  forceDefaultsUpdate
  } from '../../util.js';
 import { TASKS_CONFIG_JSON_FILENAME, ARCHIVES_PATH, TEMP_PATH } from '../../constants.js';
 import { getFilePathQuestions, getFileNameQuestions, updateTempArchive, updateSavedFilePath  } from './helper.js';
+import { showCurrentStatus } from '../show-status/index.js';
 
 export const DXCB_CONFIG_INTERNAL_JSON_FILENAME = 'src/dxcb.config.json';
 const currentDirectory = process.cwd();
@@ -214,7 +219,7 @@ export const moveComp = async(componentKey, orgLibName, version, copyShared, opt
     fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 2  });
 }
 
-export const importArch = async(filePath, fileName) => {
+export const importArch = async(filePath, fileName, hadArchive) => {
 addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
 
   const currentDirectory = process.cwd();
@@ -326,8 +331,44 @@ addDebugLog("importArch", `filePath: ${filePath}, fileName: ${fileName}`, "");
   // delete temp directory
   fs.rmSync(tempDirectory, { recursive: true, force: true, maxRetries: 2  });
 
-  console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
-  console.log(`You can switch to ${chalk.green(`${orgLibName}/${version}`)} via npm run switchLib.\n`);
+
+  if (hadArchive) {
+    console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+    console.log(`You can switch to ${chalk.green(`${orgLibName}/${version}`)} via npm run switchLib.\n`);
+  }
+  else {
+    const switchToFileName = `${orgLibName}_${version}.zip`;
+
+    const tasks = new Listr(
+      [
+        {
+          title: `Restoring ${orgLibName}/${version}`,
+          task: async () => {
+            await restoreFromArchive(switchToFileName, orgLibName, version);
+          }
+        }
+      ],
+      { concurrent: false, exitOnError: true }
+    );
+
+    console.log(`\n${chalk.green(`${fileName}`)} has been imported!`);
+
+    await tasks.run().catch(err => {
+      console.log(chalk.bold.red(err.toString()));
+      process.exit(1);
+    });
+
+    console.log(`${chalk.bold.green(`\nSwitched to ${orgLibName}/${version}!\n`)}`);
+
+    await forceDefaultsUpdate();
+    await showCurrentStatus();
+
+    console.log('\n***************************************************************');
+    console.log(chalk.bold.yellow('Dependencies have changed between versions, recommend updating.'));
+    console.log(`PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
+    console.log('****************************************************************\n');
+  }
+
 
 }
 
@@ -349,7 +390,7 @@ export const getZipFileList = async(filePath) => {
 
 export default async options => {
   await showVersion();
-  await checkLibraryAndArchives();
+  // await checkLibraryAndArchives();
 
   await checkPathAccess(pegaConfigJsonPath);
   const isLibraryBased = getLibraryBased();
@@ -358,6 +399,8 @@ export default async options => {
     process.exit();
   }
 
+  const hasArch = await hasArchives();
+
   await cleanUpTemp();
 
   addDebugLog("importArchive", "", "+");
@@ -366,7 +409,7 @@ export default async options => {
   if (options.params.length >= 5) {
     const filePath = options.params[3];
     const fileName = options.params[4];
-    await importArch( filePath, fileName);
+    await importArch( filePath, fileName, hasArch);
 
   }
   else {
@@ -388,7 +431,13 @@ export default async options => {
     const {fileName} = fileNameAnswers;
 
 
-    await importArch( filePath, fileName);
+    await importArch( filePath, fileName, hasArch);
+
+    // 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);
+
+
 
   }
 

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

@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.15.1",
-    "@pega/custom-dx-components": "~0.242.47",
+    "@pega/custom-dx-components": "~0.242.48",
     "@pega/pcore-pconnect-typedefs": "~3.2.0-alpha.1",
     "@storybook/addon-actions": "^7.6.19",
     "@storybook/addon-essentials": "^7.6.19",

package/src/tasks/show-status/index.js

@@ -7,7 +7,7 @@ import { showVersion, getLibraryBased, addDebugLog, getConfigDefaults, getCompon
 
 export const showCurrentStatus = async () => {
 
-  const configDefaults = await getConfigDefaults();
+  const configDefaults = getConfigDefaults();
   const componentList = await getComponents();
 
   console.log("");

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

@@ -94,8 +94,6 @@ addDebugLog("switchLibrary", "", "+");
       ({ version } = nextAnswers);
     }
 
-
-
   }
 
   // in this scenario, version contains "-dev", if appropriate
@@ -132,12 +130,6 @@ addDebugLog("switchLibrary", "", "+");
     process.exit(1);
   });
 
-  // archive existing
-  // await zipVersionAndArchive(existingOrgLib, oldVersion);
-
-  // restore from archive
-  // await restoreFromArchive(switchToFileName, newOrgLib, newVersion);
-
   console.log(`${chalk.bold.green(`\nSwitched to ${newOrgLib}/${newVersion}!\n`)}`);
 
   await forceDefaultsUpdate();
@@ -150,16 +142,6 @@ addDebugLog("switchLibrary", "", "+");
     console.log(`PLEASE run ${chalk.bold.yellow("'npm update'")}.`);
     console.log('****************************************************************\n');
 
-    // const upateQuestions = await getRunNpmQuestions();
-    // const answers = await inquirer.prompt(upateQuestions);
-    // const { updateNpm } = answers;
-
-    // if (updateNpm) {
-    //   await anotherTask.run().catch(err => {
-    //     console.log(chalk.bold.red(err.toString()));
-    //     process.exit(1);
-    //   });
-    // }
   }
 
 

package/src/util.js

@@ -134,6 +134,7 @@ export const setUpDefaults = async () => {
       retrievedConfigData.importRelativePath = data[IMPORT_RELATIVE_PATH];
     }
 
+
     if (data[EXPORT_RELATIVE_PATH]) {
       retrievedConfigData.exportRelativePath = data[EXPORT_RELATIVE_PATH];
     }
@@ -572,9 +573,9 @@ if (showDebug) addDebugLog("getComponentsObj", "END", "-");
   return compList;
 };
 
-export const getPegaConfig = async () => {
+export const getPegaConfig = async (force = false) => {
 if (showDebug) { addDebugLog("getPegaConfig", "", "+"); }
-  if (!pegaData) {
+  if (!pegaData || force) {
 
 if (showDebug)  { addDebugLog("getPegaConfig", "retrieveData", ""); }
     const currentDirectory = process.cwd();
@@ -622,7 +623,7 @@ export const updateServerConfigRuleSetAndVersion = async (rulesetName, rulesetVe
 if (showDebug) addDebugLog("updateServerConfigRuleSetAndVersion", `rulesetName: ${rulesetName}, rulesetVersion: ${rulesetVersion}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-  let configData = await getPegaConfig();
+  let configData = await getPegaConfig(true);
   let serverConfig = configData['server-config'];
 
   serverConfig.rulesetName = rulesetName;
@@ -641,7 +642,7 @@ if (showDebug) addDebugLog("updateComponentDefaultLibrary", `library: ${library}
 
   await checkPathAccess(pegaConfigJsonPath);
 
-  let config = await getPegaConfig();
+  let config = await getPegaConfig(true);
   let componentsDefault = config.component;
   componentsDefault.library = library;
 
@@ -657,7 +658,7 @@ if (showDebug) addDebugLog("updateComponentDefaultVersion", `version: ${version}
 
   await checkPathAccess(pegaConfigJsonPath);
 
-  let config = await getPegaConfig();
+  let config = await getPegaConfig(true);
   let componentsDefault = config.component;
   componentsDefault.version = version;
 
@@ -679,7 +680,7 @@ export const setConfigDevBuild = async (devBuild) => {
 if (showDebug) addDebugLog("setConfigDevBuild", `devBuild: ${devBuild}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-  let configData = await getPegaConfig();
+  let configData = await getPegaConfig(true);
   let serverConfig = configData['server-config'];
   serverConfig.devBuild = devBuild;
 
@@ -692,7 +693,7 @@ export const setConfigImportRelativePath = async (importRelativePath) => {
 if (showDebug) addDebugLog("setConfigImportRelativePath", `importRelativePath: ${importRelativePath}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-  let configData = await getPegaConfig();
+  let configData = await getPegaConfig(true);
   configData[IMPORT_RELATIVE_PATH] = importRelativePath;
 
   // update file
@@ -704,7 +705,7 @@ export const setConfigExportRelativePath = async (exportRelativePath) => {
 if (showDebug) addDebugLog("setConfigImportRelativePath", `exportRelativePath: ${exportRelativePath}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-  let configData = await getPegaConfig();
+  let configData = await getPegaConfig(true);
   configData[EXPORT_RELATIVE_PATH] = exportRelativePath;
 
   // update file
@@ -813,7 +814,7 @@ export const setServerType = async(serverType) => {
 if (showDebug) addDebugLog("setServerType", `serverType: ${serverType}`, "");
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
-  let configData = await getPegaConfig();
+  let configData = await getPegaConfig(true);
   let serverConfig = configData['server-config'];
   serverConfig.serverType = serverType;